Initial 2.4.1 fixes

Build fixes to work with next build. -pom fixes for pom file generation.