UP-4230:  Update bundled CalendarPortlet to 2.2.1