Merge branch 'stable'

* stable:
  Expand LDAP groups only if accountMemberField set
  Define a toString for PatchListKey to improve errors