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 <cpuguy83@gmail.com> (github: cpuguy83)
comma should be after "and", not after SIGTERM.