MDL-18375 calendar: removed unnecessary functions for converting years and now use existing functions