Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add new maintainer Han-Wen Nienhuys as developer in pom.xml files
  Set version to 2.14.18-SNAPSHOT
  ldap: allow to disable the groups relevance filtering

Change-Id: I32e63792fe13436575167074139ae304915d2aec
diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml
index f90d3ac..4eecff5 100644
--- a/tools/maven/gerrit-war_pom.xml
+++ b/tools/maven/gerrit-war_pom.xml
@@ -44,6 +44,9 @@
       <name>Edwin Kempin</name>
     </developer>
     <developer>
+      <name>Han-Wen Nienhuys</name>
+    </developer>
+    <developer>
       <name>Hugo Arès</name>
     </developer>
     <developer>