Merge "Switch statsd config to zuul.conf" into feature/zuulv3