Touch the etag on the primary table before all the transactions.  This will also act as a lock (prevent deadlock)
Add etag checking to tests
Merge pull request #818 from kaysoky/Release21_CredEtag

Stack-21 - Etags for credentials