Fixed merge problems on master #4197
Merge pull request #4203 from dotCMS/issue-4197-master-merge-fix

Fixed merge problems on master #4197