TEIID-2641 improving txn semantics and correcting several other issues
Conflicts:

	engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java
BZ971531 changes related to productization
Merge branch '8.4.x' of git://github.com/teiid/teiid

Conflicts:
	engine/src/test/java/org/teiid/query/processor/proc/TestProcErrors.java
	engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java