fixes #6647
Merge pull request #6648 from dotCMS/issue-6647-jspportlet-improvements

fixes #6647