Merge branch 'patch/nfs_stats_with_network_plugin' into release/5.2.2

Conflicts:
	src/nfs.c
	src/types.db
New release 20130410