Merge commit '1bc10b1acfbe30678da22c272bdb4eb3e3c6ae55' into next-1.23

Conflicts:
	connman/src/manager.c
	connman/src/technology.c