Changed ldap.groups to ldap.logingroups and ldap.logingroups.global.
Merge branch 'dev' into test