HFX-1078: [SCTX-1635] Handle storage exception while unplugging VBD.

Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
Merge pull request #1675 from yunleid/CA-124981

CA-124981: Port the fix of HFX-1078 from clearwater-sp1-lcm to trunk