9c960b1 bring back NFS fix

Authored and Committed by labbott 5 years ago
    bring back NFS fix
    
    When doing the 5.0 rebase, I mistakenly thought a conflict meant
    a patch had been merged. Turns out, it was an actual (minor) conflict.
    Bring back the rebased patch which can actually be dropped with 5.1.
    
        
file modified
+3 -0
file modified
+260 -267