First commits
Second commit
Updates before review
Remove two info logs
Add mapping to UTs
Fix to registration test
Updates after review
Merge branch 'master' of github.com:Metaswitch/sprout into sto625

Conflicts:
	sprout/Makefile
Merge branch 'dev' of github.com:Metaswitch/sprout into sto625
Updates after review
Merge branch 'master' of github.com:Metaswitch/sprout into sto625
Merge pull request #365 from Metaswitch/sto625

[Reviewer: Alex] Sto625