Do more checks on the reg data from the HSS
Updates after review
Merge branch 'dev' of github.com:Metaswitch/sprout into iss591
Merge pull request #878 from Metaswitch/iss591

[Reviewer: Matt] Do more checks on the reg data from the HSS