[connectionagent] fix merge

Merge branch 'master' into next

Conflicts:
	connd/connd.pro
	connd/main.cpp
	connd/qconnectionmanager.cpp
	connectionagent.pro
	rpm/connectionagent.spec
	test/auto/tst_connectionagent/tst_connectionagent.pro