MDL-41792 block_calendar_month: tidy existing code
MDL-41792 block_calendar_upcoming: tidy existing code
MDL-41792 calendar: refactored the calendar to allow the use of multiple calendar types