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

vharseko

03.36.2018 81c844eb5019226a5dd1efc9c2e124ac47580150

 opendj-dsml-servlet/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-parent</artifactId>
        <version>4.1.4-SNAPSHOT</version>
        <version>4.1.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-dsml-servlet</artifactId>