2nd commit for index translations support (bug 947291)

The patch in PR 1505 is intended to be merged first, then a reindex, then apply this patch which updates all the code to use the new fields that were added in the prior commit.