Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

Didn't bother with files in db/, config/, or features/

Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>