Import a few more fixes from the Nova driver

Import a few fixes based on comments on rev 4 of
https://review.openstack.org/#/c/103167/

Change-Id: Ic7f6b54e9b4b94b4cb3108dd7d4ea808a99fa382