Fix: Change to make debian package ok despite removal of ckeditor
package.
Update doc
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	ChangeLog
Merge remote-tracking branch 'origin/3.4' into 3.4_backported