Take latest cpp-common and remove files moved to there
Merge pull request #136 from Metaswitch/update_cpp_common

[No review required] Take latest cpp-common and remove files moved to there
Remove mockdiameterstack.hpp (move to cpp-common)
Merge pull request #138 from Metaswitch/Move_mockdiameterstack

[No reviewer] Remove mockdiameterstack.hpp (move to cpp-common)
Merge remote-tracking branch 'origin/dev' into Rename_Handler_Branch

Conflicts:
	src/ut/mockdiameterstack.hpp
	src/ut/mockhttpstack.hpp