MDL-18375 calendar: changed the order of the parameters passed to conform to other core functions