fixes #5417
Merge pull request #5427 from dotCMS/issue-5417-redo-repackaging-for-xpath-and-w3c-dom

fixes #5417