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