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

[Reviewer: Mike] Overload return codes