fixes #6176 Problems after make the upgrade
fixes #6176 Problems after make the upgrade
Merge pull request #6244 from dotCMS/issue-6176-Problems-after-make-the-upgrade

Issue 6176 problems after make the upgrade