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