Merge "Openstack API check improvements"