ensure adding existing index doesn't change system.indexes
Merge branch 'correctindex' into uniqueindexes
try to handle index correctly