Updates after code review
Merge branch 'sto382_em' of github.com:Metaswitch/sprout into sto382_em

Conflicts:
	sprout/pjutils.cpp