fixes #3939
Merge pull request #3949 from dotCMS/issue-3939-fix-unit-tests-for-master-and-2.5

fixes #3939