Merge "Set better defaults for server logging" into feature/zuulv3