Merge remote-tracking branch 'origin/devel-0.6' into py_native_api

Conflicts:
	config/plugins.m4
	src/xdpd/management/plugins/Makefile.am
	src/xdpd/management/plugins/plugin_manager_loader.cc