Integrate support for multiple diameter connections with Ralf
Merge remote-tracking branch 'origin/master' into sto639

Conflicts:
	modules/cpp-common
Update cpp-common
Update cpp-common
Update freeDiamater
Update to realmmanager api
Code review markups
Update cpp-common
Update cpp-common
Merge pull request #42 from Metaswitch/sto639

Reviewer AMC: Integrate support for multiple diameter connections with Ralf
Merge remote-tracking branch 'origin/dev' into memory-leak-fixes