Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: integration-cli/docker_cli_build_test.go Upstream-commit: 0e71a48d4e89ce40c0ab94cc18599481d9e8a6b0 Component: engine