relicense

ok from copyright holders: me, Red Hat, Canonical
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'

Conflicts:
	tools/syslogd.c