Fix for ENTESB-2035 - SNI port for MQTT and STOMP mapping inconsistency