Allow cloud_properties to be merged for all openstack resource pools
Remove floating ip network section from ha_proxy_z1 for clc networks