Merge "Add a check for duplicate configuration on statsd" into pi-dev