slim and xdm replace by cdm
replace gnome-extra/connman-gnome by net-misc/connman-ui
Merge remote-tracking branch 'origin/h9' into h6

Conflicts:
	world