CA-114341

Restore the patches that:
- Make the GC to try to re-acquire the VDI lock in non-blocking mode in order to allow VDI.attach/activate operations to proceed.
- Check the return value of the lvhd plugins.

Add a patch that effectively increases the time-out for VDI.activate to acquire the VDI lock.