CA-141409 strict nfs version

Amended the original patches for xs64bit