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
Fixes the problem with unexpected rollbacks for new users that have not signed the terms yet.
Merge pull request #829 from kaysoky/release-21

Stack-21 - new user password change fix
Merge branch 'release-21' into develop
Merged new user pwd fix from release-21

Conflicts:
	services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/AuthenticationManagerImpl.java