bring changes from master for ci sanity failure in get_nova_host_of_vm

Change-Id: I0e805f837ce6cf71aea5469ccf5feebd5a9a6535