PAHMA-964: Fix reindexing of contacts.
Merge branch 'ucb-deploy_3.3' into botgarden_3.3