Netexception 3
Merge remote-tracking branch 'origin/devel-aldo' into devel-aldo

Conflicts:
	tests/broker_connection.cpp
	tests/integration_tests.cpp