Fix #261338: Enable selection of none, theme or user-defined logo. Added also capability to upload logo directly from the settings form.
Fix PDF bug that prevented correct PDF generation introduced in the last patch.
Move the setting form elements back to the defined fieldsets.