Merge "Permit config shadowing" into feature/zuulv3