Merge changes I56285ca2,I443c7767

* changes:
  Simplify check for volume mount paths
  Run tests only on VISIBLE volumes that are accessible by apps