Merge "Add skipped CRD tests" into feature/zuulv3