Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Adapt to new ProjectCache interface Depends-On: https://gerrit-review.googlesource.com/c/gerrit/+/324619 Change-Id: I0bb21fd8c29337b53643fd31959ec891ded23d2e