docker/docker — pull request #7374 by cpuguy83 (2014-08-01 16:03:21+00:00)
Title: Revert --stop/--kill and use --timeout instead

Reverts #6987 and instead uses a --timeout option to specify the wait
time.
Default timeout is set to 5 seconds

Docker-DCO-1.1-Signed-off-by: Brian Goff (github: cpuguy83)