Merge nfs containerization work from Trond's tree

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

Conflicts:
	fs/nfsd/nfs4proc.c
	fs/nfsd/nfs4state.c
	fs/nfsd/nfs4xdr.c
Makefile adjustments

Conflicts:
	Makefile
	arch/arm/vfp/Makefile