WIP defensive servicePort resolution to aid migration