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