Merge "Expose Elasticsearch port for binary protocol"