Merge "Re-enable 4 disable tests" into feature/zuulv3