Change port numbers around
Merge pull request #93 from Metaswitch/port_updates

[Reviewer: Matt] Change port numbers around