[connectionagent] support connman 1.21 and refactor
[connectionagent] update version
[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
[connectionagent] dont try to connect if already connected.
Will result in 'Already connected' error
Merge pull request #58 from lpotter/next

update to connman 1.21