Merge "Remove test_upgrade" into feature/zuulv3