Merge nfs containerization work from Trond's tree

The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.

diff --cc fs/lockd/svc.c
Simple merge

diff --cc fs/nfsd/nfs4callback.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfssvc.c
Simple merge

diff --cc include/linux/nfs4.h
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge

diff --cc net/sunrpc/svcauth_unix.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge