Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Adapt to new ProjectCache interface

Depends-On: https://gerrit-review.googlesource.com/c/gerrit/+/324372
Change-Id: Ib923cc05d421d4d77bcba612c15a5f14736b33dd