Index on COMPLETED_TXN_COMPONENTS in Metastore RDBMS has different names in different scripts

In mysql and mssql install scripts the index is called COMPLETED_TXN_COMPONENTS_IDX2  Everywhere else it is called COMPLETED_TXN_COMPONENTS_IDX, which is breaking upgrade scripts for 3.0 to 3.1 since they don't know which index to update.  One name should be chosen and used everywhere.