Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ.git

vharseko

11.21.2018 d5b0a03b710cf353995e8cbd941dabb46415ca4c

 opendj-server-legacy/pom.xml

@@ -20,7 +20,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.1.5-SNAPSHOT</version>
    <version>4.1.6-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-legacy</artifactId>
  <packaging>jar</packaging>