Extract mount point merging logic into separate function
Merge pull request #8562 from owncloud/better-addmountpoint

Extract mount point merging logic into separate function