copies master fix to 2.5 #4197
Merge pull request #4206 from dotCMS/right-fixes-for-4197-2.5

copies master fix to 2.5 #4197