CA-105903: vbd-unplug --force works regardless of surprise-remove state

This is just acknowledging the changes that were introduced in Tampa, and not a
change in behaviour since Tampa.

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Signed-off-by: David Scott <dave.scott@eu.citrix.com>