Updated indexes to order the keys before inserting them into the database. This assures no deadlocks will occur between multiple adds and mods. 
Disabled lock timeouts for add and mod operations since deadlocks can not occur. This prevents txn aborts and op retry expiration due to lock timeouts of add and mod operations when the server is under high write load. 

Fix for issue 2186