Rebasing to fix the merge conflict
Merge pull request #18978 from garethgreenaway/nfs_requires_remount_options_changed

fixes to mount for nfs share