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