merge fixes for system.users index upgrade path