Merge "Fix directory comparison in tryMountDataMirror"