Merge "BUG-2314 Expose inventory mountpoint on proper path"