Update terminating conditions
Merge pull request #454 from Metaswitch/issue443

[No reviewer] Update terminating conditions
Merge branch 'master' of github.com:Metaswitch/sprout into p_charging_headers
Updates after review