rhbz1023247 Prevent concurrent updates to Activity entities