pushing changes upstream into the project

Conflicts:

	build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli