[18.09 backport] Fixes for e2e testing after Alpine bump#1729

vdemeester merged 3 commits intodocker:18.09docker/cli:18.09from

thaJeztah:18.09_backport_e2e_handle_alpine_bumpthaJeztah/cli:18.09_backport_e2e_handle_alpine_bumpCopy head branch name to clipboard