Support multiple entries #17198

Allow multiple entries without having the value overwritten
I just updated the pull request. We don't need to check to see if the device and mount point differ.

I will run a few more test cases to see if I can detect any issues.