rhbz1023247 Prevent concurrent updates to Activity entities
Merge remote branch 'origin/quartz165' into rhbz1023247

Conflicts:
	pom.xml
Update SeamAutowire to check required/create/AutoCreate
Fix lock-handling in ActivityServiceImpl
rhbz1026155 - fix NPE
Inject authenticatedUser into REST tests
Auto-create stateless components in SeamAutowire
Mark TranslationStateCacheImpl as @AutoCreate; Reset SeamAutowire between tests
Merge remote branch 'origin/master' into rhbz1023247

Conflicts:
	zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
Reset SeamAutowire before tests
Give meaningful names to async tasks
Merge pull request #247 from zanata/rhbz1023247

rhbz1023247 Prevent concurrent updates to Activity entities
Merge pull request #272 from zanata/async-task-names

Give meaningful names to async tasks
Merge pull request #270 from zanata/rhbz1026155

rhbz1026155 - fix NPE
Add missing injection of Authenticated account when starting an async task.
rhbz1030732 - Change copy trans to load document entity within the spawned transaction.
Merge pull request #275 from zanata/rhbz1030732

rhbz1030732 - Change copy trans to load document entity within the spawned transaction.
Merge branch 'integration/master' into rhbz991336

Conflicts:
	zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
	zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
	zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java