Merge changes I561d6864,I7e909cda into 24D1-dev

* changes:
  Use customized toString for UUID in VTS
  Effect VTS: skip VolumeDataTest for U