Improve error message
Merge branch 'token-auto-provisioning' of https://github.com/ebu/cpa-auth-provider into token-auto-provisioning

Conflicts:
	test/lib/user-mode-validation.js