nfs-server.patch - sync with upstream
Merge pull request #509 from lslezak/nfs-serve_patch_update

nfs-server.patch - sync with upstream