Merge changes from topic "gateway-connection-id"

* changes:
  Expose API for identifying GatewayConnections.
  Update identification for onGatewayConnectionError().