Adding missing class after the merge. Fixing warnings from pom.xmls