Merge "Adds locks to ConfigManager in statsd."