Merge "Use 'gatewayConnectionName' for VcnGatewayConnection IDs."