CA-105002: Robustify against domains that are unkillable

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #1224 from jonludlam/CA-105002

CA-105002: Robustify against domains that are unkillable