Moved Tianon's PR from: https://github.com/docker/docker/pull/7870 on top of the latest code Closes: #3936 Signed-off-by: Andrew Page <admwiggin@gmail.com> Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed Component: engine