Conflicts:
	systems/admin/systems/class_SelectDeviceType.inc
	systems/admin/systems/class_networkSettings.inc
	systems/admin/systems/class_systemManagement.inc
	systems/admin/systems/services/class_ServiceAddDialog.inc
	systems/admin/systems/tabs_component.inc
	systems/admin/systems/tabs_printers.inc
	systems/admin/systems/tabs_server.inc
	systems/admin/systems/tabs_terminal.inc
	systems/admin/systems/tabs_workstation.inc

Conflicts:
	ldapmanager/addons/ldapmanager/class_csvimport.inc

Conflicts:
	ldapmanager/addons/ldapmanager/class_ldapmanager.inc

This reverts commit 7b9fc9d1.

This reverts commit df5b395e.

Conflicts:
	argonaut/admin/systems/argonaut/class_argonautClient.inc
	debconf/admin/systems/debconf/class_debconfStartup.inc
	fai/admin/systems/class_faiLogView.inc
	fai/admin/systems/class_faiStartup.inc
	systems/admin/ogroups/goto/class_termgroup.inc
	systems/admin/systems/class_terminalStartup.inc
	systems/admin/systems/class_workstationGeneric.inc