Merge "Re-enable requirement-username tests" into feature/zuulv3