Enable SIPResolver UTs and pull in new version of cpp-common with fixes
Fix merge conflict
Merge pull request #390 from Metaswitch/sto622

[No reviewer required] Enable SIPResolver UTs and pull in new version of cpp-common with fixes