Merge "Mask dependent config errors" into feature/zuulv3