Fix up failures caused by removing logic to derive private ID; remove test for that case
Merge branch 'dev_new_homestead_api' of github.com:Metaswitch/crest into dev_new_homestead_api