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>
Merge pull request #1389 from mcclurmc/surprise

 CA-105903: VBD surprise-remove flag is now ignored