Switched CalendarProviders to branch jb-mr1.1-release