Use a simpler port format for the erps service details, and add a special case for lags.
Merge remote-tracking branch 'upstream/master'
Update erps stuff to support port or port reference in service port.
upreved following pull request from James