Merge "Add a check for duplicate configuration on statsd" into pi-dev am: a32913f087
am: c642bd673b

Change-Id: Icf872ba6b675c700fd47b110030d7cf9080d06c0