Merge nfsd bugfixes

These are some nfsd bugfixes that I also want in the main branch that
will be submitted for the 5.4 merge window.