fixes #4674
Merge branch 'master' of github.com:dotCMS/dotCMS
Merge remote-tracking branch 'origin/master' into issue-3266-Make-New-WAR-Infrastructure