More fixes after trying the simplified api#17695

jsoriano merged 4 commits intoelastic:mainelastic/integrations:mainfrom

jsoriano:more-fixes-after-simplified-apijsoriano/integrations:more-fixes-after-simplified-apiCopy head branch name to clipboard