Manually merged `cb38ce9` KualiCo pom.xml changes.

Conflicts:
	pom.xml
updated CX_PORTING for cx_patches/pom.xml.patch