Merge branch 'stable-3.6' * stable-3.6: Bump Lombok to 1.18.22 Adapt to Gerrit stable-3.6 Change-Id: I55532bfef8247387d22a45e137078b60dd2084cd