Use 504 rc
Merge pull request #600 from Metaswitch/iss572

[Reviewer: Mike] Overload return codes
Update cpp-common
Merge pull request #601 from Metaswitch/iss572

[No reviewer] Update cpp-common