Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Expand capabilities of ldap.groupMemberPattern