Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev