Merge "Handle RepositoryNotFoundException when running reindex" into stable-2.8