Merge "Create extra-test-setup role" into feature/zuulv3