Merge "Replace openstack_proxy_address with cluster_public_host"