Merge "Remove now-unused ZuulTestCase.resetGearmanServer" into feature/zuulv3