Merge "Rename a few things in statsd_config.proto."