[SWITCHYARD-2219] - Fix client port