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

vharseko

06.01.2018 fe4a729c18b46801d1ea3f5644f80de76b88362d

 opendj-maven-plugin/pom.xml

@@ -19,7 +19,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-maven-plugin</artifactId>