Merge "Re-enable requirement-older-than tests" into feature/zuulv3