Revert --stop/--kill and use SIGKILL instead

Reverts #6987 and instead uses SIGKILL immediately

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Damn, missed one.  Push is on the way.