CASC-214 Improve Service Url Construction to Add Non-Standard Ports