Make zmq port different between sprout and bono
Correct script
Merge branch 'master' of github.com:Metaswitch/sprout into sto640
Updates after review
Update cpp-common, and remove fakelogger now that its in cpp-common
Merge pull request #433 from Metaswitch/sto640

[Reviewer: Graeme] Make zmq port different between sprout and bono