Merge branch 'maint' into next

Conflicts:
	make_debs/configs/create_deb.conf
	make_debs/configs/init/adtnplatform
	make_debs/install_scripts/README