Merge branch 'connman-agent' of ssh://tzo/profile/ivi/settings-daemon into connman...

Merge branch 'connman-agent' of ssh://tzo/profile/ivi/settings-daemon into connman-agent

Conflicts:
	configure.ac
	include/settingsd/glib_traits.hpp
	include/settingsd/send_callback.hpp
	include/settingsd/unique_ptr.hpp
	plugins/connman/Makefile.am
	plugins/connman/bluetooth.hpp
	plugins/connman/connman_manager.cpp
	plugins/connman/connman_manager.hpp
	plugins/connman/connman_service.hpp
	plugins/connman/connman_technology.hpp
	plugins/connman/dbus_connection.hpp
	plugins/connman/registration.cpp
	plugins/connman/service.cpp
	plugins/connman/service.hpp
	plugins/connman/technology.cpp
	plugins/connman/technology.hpp
	src/daemon.cpp

Change-Id: I83b01a639b215a93cf064f4b2cef2929814f8855