Cherry-pick #15738 to 7.x: Fix mapping and race condition in sql module#15748

jsoriano merged 1 commit intoelastic:7.xelastic/beats:7.xfrom

jsoriano:backport_15738_7.xjsoriano/beats:backport_15738_7.xCopy head branch name to clipboard