This is to apply changes applied to openstack/computer-hyperv to the in-tree hyper-v code. Change-Id: Ib89c2e407bea5168f2eebb12cfb2d50e4566ff7a Closes-Bug: #1773342