Merge changes from topic "jun15" into rvc-dev

* changes:
  Attempt to improve test robustness.
  Optimized query for detecting empty collections.
  Use volume names instead of "Unknown".
  Avoid deadlock during applyBatch().
  Gracefully handle trashing/pending missing files.