UP-3654:  Fix build errors that cropped up from this effort (bundled CalendarPortlet)