Merge "Make statsd import failure raise exception" into feature/zuulv3