CA-105002: Robustify against domains that are unkillable

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #1264 from mcclurmc/ca105002-clearwater-minion

CA-105002: Robustify against domains that are unkillable