Merge nfs containerization work from Trond's tree