per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939 Signed-off-by: Casey Bisson <casey.bisson@joyent.com> Upstream-commit: 19e3db35039ae80409623266906093b2314bd970 Component: engine
Signed-off-by: Casey Bisson <casey.bisson@joyent.com> Upstream-commit: c8abc52736ae1e3898b2512e4efe2553110eb481 Component: engine