Merge remote-tracking branch 'origin/master' into vharseko-master

vharseko

19.21.2018 33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8

 opendj-server/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server</artifactId>
  <name>OpenDJ Server NG</name>