closes #4046
Merge branch 'master-2.5' of github.com:dotCMS/dotCMS into master-2.5