fixes #1798
Merge pull request #1799 from dotCMS/issue-1798-timezone

fixes #1798