Fix retrieving of mount points for shared storage, fix #3218

Fix #3218. Problems arose from #3136 

@icewind1991 @rperezb @DeepDiver1975 @bartv2