Revert "fix failing test to use kill instead of stop"

This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Revert "Disable automatic killing of containers when docker stop fails"

This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #4835 from crosbymichael/reverst-stop-kill

Revert back to the default stop functionality of SIGKILL after timeout