TEIID-3137 pushing changes upstream from 8.7.  One small change was required to DSLSearch to work using Infin. 6.0, instead of Infin. 6.1

removed the unneeded dependency on the pojo module

TEIID-3137 misc changes