54367580 add indexes

Merge from master 1.6
Migration adding indexes on uuid_resources table.