54367580 add indexes

Merge from master 1.7
Add migration adding indexes in uuid_resources