Merge "Enable 4 CRD unit tests" into feature/zuulv3