TEIID-196 adding a missed check-in/misc changes seen made while
implementing the feature