Add a new option to sprout to specify the port of the upstream proxy (defaulting to the locally-configured trusted port).
Allow bono and sprout to be installed on the same node
Merge dev into allow_bono_sprout_different_trusted_ports
Fix UT
Merge pull request #85 from Metaswitch/allow_bono_sprout_different_trusted_ports

[Reviewer: Mike] Allow bono and sprout to have different trusted ports