Import missing changes from xen-api.git