GEOS-5813: LDAP RoleService backporting to 2.4.x