54367580 add indexes

Merge from master 1.8.1
Migration adding indexes on uuid_resources table
Fix Warnings during rspec execution