reverted sunrpc, lockd, NFS, & cif modules being built into kernel; t0lte fixed cherry-pick conflicts