Merge branch 'devel' into sz4

Conflicts:
	acinclude.m4
	debian/control
	libSzarp2/include/szarp_config.h

also fix some small problems that were preveting UTs from passing