"Locked user" error message with localization.
Merge branch 'osng-481' of https://github.com/osiam/server into osng-481

Conflicts:
	auth-server/src/main/deploy/auth-server/l10n/login.properties