Windows: dockerfile tweaks Upstream-commit: 5c9e38b73f4f5b6f2984436f6defd74a1eea9c9c Component: engine