none
adding scanning
too much to put in this message
Merge branch 'develop' into table-rows
Touch the etag on the primary table before all the transactions.  This will also act as a lock (prevent deadlock)
added row level conflict checking
fixed update helper
Merge pull request #813 from john-hill/table-rows

Table rows
Add etag checking to tests
add missing sources for GWT unit test
Merge pull request #815 from marcel-blonk/upstream

add missing sources for GWT unit test
[PLFM-2318] Refine migration of V2 wikis to only migrate differences
Merge pull request #816 from heidiso/wikiMigrationChanges

[PLFM-2318] Refine migration of V2 wikis to only migrate differences
Merge pull request #814 from kaysoky/CredentialsNeedEtag

Etags for credentials
Use iterator for safe modification of lists
Safely reconstruct primary types list
Merge pull request #819 from heidiso/wikiMigrationChanges

Use iterator for safe modification of lists
PLFM-2315
Merge pull request #821 from brucehoff/PLFM-2315

PLFM-2315