Signed-off-by: Michael Crosby <michael@docker.com> Conflicts: registry/service.go Upstream-commit: f43e77fc125840f40af52da01cd2a62bca49765e Component: engine