FIX: connman override hostname via dhcp
Merge branch 'h6-gentoo' into h3-gentoo

Conflicts:
	conf.d/hostname
	conf.d/net
	hosts
	portage/package.keywords