Conflicts: api.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux) Upstream-commit: 4c1879f919689cd884848f3c2269df942a5788cf Component: engine