Merge configs from files and service discovery for the same check#3899

sodabrew wants to merge 2 commits intoDataDog:masterDataDog/dd-agent:masterfrom

sodabrew:astone/merge-discovered-checkssodabrew/dd-agent:astone/merge-discovered-checksCopy head branch name to clipboard