Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev