fixes one half of #2844
Merge branch 'master' of https://github.com/dotCMS/dotCMS into issue-2844-timemachine-issues
Merge branch 'master' of https://github.com/dotCMS/dotCMS into issue-2844-timemachine-issues
#2844 new ee.jar with changes
Merge pull request #3010 from dotCMS/issue-2844-timemachine-issues

Issue 2844 timemachine issues