Merge changelogs.

Conflicts:
	bundles/groupware/docs/CHANGES
	bundles/groupware/package.xml
	bundles/webmail/docs/CHANGES
	bundles/webmail/package.xml