Removed all version properties which are not used in root pom.xml, resol...

...ved conflicts