Merge "More formatting fixes for statsd"