Apply same fixes as in beat.core!38

3 jobs for new-test-strategy in 19 minutes and 49 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_36 #150544
docker

00:06:30

56.0%
passed build_macosx_36 #150545
macosx

00:03:15

56.0%
 
  Docker
passed docker_linux_36 #150546
docker-build

00:13:15

59.0%