KER-278: Make the comparator of Calendar more flexible to allow same time zone with a different ID