A number of changes related to indexing. The change token was not being correctly updated when chnages were made to public entities.

Moved collection indexing calls back to CoreCalendars and out of index process.