Merge pull request #1552 from diox/fix-collectionmembership-cache-invalidation

Manually invalidate CollectionMembership when adding an app (bug 950238)
Delay reindexing apps in collections (bug 950839)
Don't use ES for apps in a collection in preview mode (bug 950839)

Necessary now that the indexing is properly delayed.