fix SNAFUs from careless merges
Merge branch 'statsd_integration_prep_core' into statsd_integration_statsd_module