OSNG-10 reverted pom.xml due to merging error