Add some db table indexes
Maybe speed up search slightly
Merge branch 'c4c.staging.search_discover_contacts' into c4c.staging
Merge branch 'c4c.staging.hotfix' into c4c.staging