[Bug 904235] Make data bucketing align to calendar