Fixes to complement update to Teiid 8.9.x

* Target file currently committed to allow inclusion of provisional saxon
  version 9.5.1