Changes related to importing 2 new bom's
Merge branch 'rebasePomChanges' of https://github.com/vhalbert/teiid
into 8.4.x

Conflicts:
	connectors/translator-object/pom.xml
	pom.xml