(bug 45529) use composite indexes on wb_terms.

Based on Sean Pringle's suggestions on bug 45529.

DEPLOYMENT: db schema change, see repo/sql/UpdateTermIndexes.sql

Change-Id: I3cd44a07666511ff836d7439540c29e824024ec4
Merge "(bug 45529) use composite indexes on wb_terms."