CAL-861 CalendarRestApi should not extend the CalendarWebService class