TRUNK-6245 set the length of the criteria column
(cherry picked from commit aabb0b489114537ba307d1212d3c5e6c9e9fdf7e)
(cherry picked from commit 3ce2efd9a1c5f3920ad1b7733073adeb0cbf2c1b)
TRUNK-6433 Methods for getting days,weeks,months,years between dates
(cherry picked from commit d7b22f03fd2efbef260442ef1e2619c5d500ecf1)
(cherry picked from commit ed354751a49b90a1d5b5dbf1bf4cbe107acf71b6)