Reversion of redundant indexes removal in core and backported it into FAMods
to sync with upstream (minor version db schema change policy)
Further char => varchar changes for loc_code and stock_id across tables