Merge branch 'upstream'

Conflicts:
	Makefile.in
	aclocal.m4
	aclocal/ltversion.m4
	compile
	config.guess
	config.sub
	configure
	linux-nfs/Makefile.in
	ltmain.sh
	support/Makefile.in
	support/export/Makefile.in
	support/include/Makefile.in
	support/include/config.h.in
	support/include/nfs/Makefile.in
	support/include/rpcsvc/Makefile.in
	support/include/sys/Makefile.in
	support/include/sys/fs/Makefile.in
	support/misc/Makefile.in
	support/nfs/Makefile.in
	tools/Makefile.in
	tools/locktest/Makefile.in
	tools/nlmtest/Makefile.in
	tools/rpcdebug/Makefile.in
	tools/rpcgen/Makefile.in
	utils/Makefile.in
	utils/exportfs/Makefile.in
	utils/gssd/Makefile.in
	utils/idmapd/Makefile.in
	utils/mount/Makefile.in
	utils/mountd/Makefile.in
	utils/nfsd/Makefile.in
	utils/nfsstat/Makefile.in
	utils/showmount/Makefile.in
	utils/statd/Makefile.in