Merge "Fix spurious configuration log error" into feature/zuulv3