nfsd: merge stable fix into main nfsd branch