Merge "Add State to statsd config language"