RealmManager UTs
Merge remote-tracking branch 'origin/dev' into sto639
First steps of adding diameterresolver tests
First steps of adding diameterresolver tests
Finish off DiameterResolver UTs
Merge remote-tracking branch 'origin/master' into sto639

Conflicts:
	modules/cpp-common
update cpp-common
Merge pull request #105 from Metaswitch/sto639

Sto639
Update cpp-common and fix warning in main
Merge pull request #106 from Metaswitch/cpp_update

[No reviewer] Update cpp-common and fix warning in main
Use common clearwater-infrastructure script to create Ralf/Homestead Diameter config
Update rcs
Merge pull request #108 from Metaswitch/sprout_572

[No reviewer] Update rcs
Tidy up access and hprof logs
Resolve issues from testing
Merge pull request #110 from Metaswitch/diameter_conf

Use common clearwater-infrastructure script to create Ralf/Homestead Dia...
Updates after review
Merge pull request #109 from Metaswitch/log_cleanup

[Reviewer: Alex] Tidy up access and hprof logs
Take latest cpp-common
Merge pull request #111 from Metaswitch/update_cpp_common_1402692364

Take latest cpp-common