UC-3049:  Improved port matching rules to include PORT_NONE and SIP_TLS_PORT