Merge "Bug 2412: Expose Mountpoints on proper path"