Merge "Use base.get_host_for_server to get server host"