Merge pull request #622 from john-hill/merge-worker

Merge worker
PLFM-2122: first pass at a clear preview service call
added tests
Small fix for UserProfileManager and its tests.
Deadlock consideration for GroupMembersDAO

- Moved zip/unzip into a utility
- Rearranged some logic within DBOGroupMembersDAOImpl to remove deadlocks
- Two methods with possible concurrent-update now catch and ignore deadlock
- Possible fix for IT510SynapseJavaClientSearchTest.testAllReturnFields
PLFM-2027: small fixes for Javadocs on EntityBundleController
Merge pull request #629 from bkng/develop

PLFM-2027: small fixes for Javadocs on EntityBundleController
also expose user group headers by prefix service in the synapse java client
- Handle Crowd->RDS migration case for "Prod User", which has a space in its name
- Disable UserInfo caching by UserManager
from code review
add clear preview integration test
Better deadlock prevention

- Locks are placed on UserGroup rows so that simultaneous update does not occur
- UserGroupDAO is now in charge of creating a corresponding row in the parents cache when a new user is created
Merge pull request #627 from kaysoky/GroupMembersDeadlocks

Deadlock consideration for GroupMembersDAO
Merge pull request #628 from kaysoky/PLFM-1750

Small fix for UserProfileManager and its tests.
Merge pull request #625 from jay-hodgson/PLFM-2122

PLFM-2122: add ability for owner to clear a file handle preview
Merge branch 'release-10' into develop
added named id generator and swapped the worker
addressed the boostrap user id of zero conflict with auto-generated ids
setting the etag
Merge pull request #634 from john-hill/PLFM-2143

Plfm 2143