Merge branch 'stable-3.3'

* stable-3.3:
  Remove index.waitTimeout configuration property
  Fix indexing locks on the sender side
  Align Project.NameKey serialization to gerrit core
  Lock on index element id rather than on index task id
  Do not change Gerrit files ownership

Change-Id: Iefc2e3a811ea1961415bbddda6f591746ac882c6