Merged invirt-xen-config into hvirt branch