Extending sql engine. Adding indexes to maintain basic optimistic concurrency.
Merge branch 'master' into gh-master