POM version updates
Merge branch 'AEM6-migration' of https://github.com/CruGlobal/CruOrg into AEM6-migration

Conflicts:
	pom.xml
Dependency version changes for AEM 6
Merge branch 'AEM6-migration' of https://github.com/CruGlobal/CruOrg into AEM6-migration