MDL-58810 calendar: Fix rrule_manager issues