CAL-720 fix build problem with timezone