Add support for container kill instead stop