pull essential nfs fixes from stable-queue, release 2.