Temporary fix to get JENKINS-20098 onto gt 2.10.2

cherry-picked some commits and removed a flaky test.