some small improvements and fix import errors
Merge branch 'v5-stable' into v7-stable

Conflicts:
	source/configuration/modules/imudp.rst
	source/configuration/modules/imuxsock.rst
	source/configuration/modules/omprog.rst