fixes for OpenStack cloudprovider

Change-Id: I52d5f4b1e660f70d6ec2678ff42269d08d4c1c25
2 files changed