Merge "Bugfix: Local Openstack Operation in HA test frameworks"