#4919 for master
Fixed broken imports
Merge pull request #4954 from dotCMS/issue-4919-Improve-XSS-Expression-master

Issue 4919 improve xss expression master