merge nfs bugfixes into nfsd for-3.19 branch