Merge "Re-enable 3 disabled tests" into feature/zuulv3