Merge "Define correct cluster_public_host on proxy node for Pike models"