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
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
Merge pull request #247 from zanata/rhbz1023247

rhbz1023247 Prevent concurrent updates to Activity entities