ChrisJohnRiley fix for sap_service_discovery
Land #2776 - Avoid having the same port twice