Oliver/HFX-908:SCTX-1334: Ensure that a force shutdown cancels any clean_shutdown.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>

Conflicts:

	ocaml/xapi/message_forwarding.ml