Merge "Fix debian-9 docker image builder"