Display the port for an app when falling back to the ip address.
Merge pull request #828 from andrewsomething/port

Display the port for an app when falling back to the ip address.
Merge remote-tracking branch 'upstream/master' into mh-unit-tests