Merge "Fix the fake statsd config. Better error messages."