Merge branch 'rebasePomChanges' of https://github.com/vhalbert/teiid
into 8.4.x

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

Conflicts:

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