Merge remote-tracking branch 'origin/master' into erp5testnode

Conflicts:
	component/busybox/buildout.cfg
	component/ca-certificates/buildout.cfg
	component/firefox/buildout.cfg
	component/gtk-2/buildout.cfg
	component/xorg/buildout.cfg
	software/erp5testnode/software.cfg