Merge changes I0ab47e2f,Ib8016996

* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content