Updated COPYING-Third-Party.
Updated for OTRSCodePolicy
Fixed: On PhoneOutbound articles,  the FROM field shows Customer ID instead Agent ID (bug#9692).

Conflicts:
	CHANGES.md
Fixed: Ticket merge action does not notify the owner of the existing ticket (bug#10196).
Fixed: GenericInterface: Mandatory TimeUnits can't be 0 (bug#10205).
Tidied.
Improved HTML filter.
Fixed: My tickets & Company tickets in 3.3.4 (bug#10212).

Conflicts:
	CHANGES.md
Fixed bug#9616 - Too long activities and transitions are not displayed correctly.

Conflicts:

	CHANGES.md
	var/httpd/htdocs/js/Core.Agent.Admin.ProcessManagement.Canvas.js
Followup for bug#10205 - GenericInterface: Mandatory TimeUnits can't be 0.
Fixed: Value "0" for DynamicsFields prevents TicketCreation (bug#10214).
1 Followup for bug#9011  - New value after value mapping can't be 0.
Fixed: DynamicField Search-Function in CustomerFrontend is not working (bug#10207).

Conflicts:
	CHANGES.md

Conflicts:
	CHANGES.md
Prepare for release.
Fixed: GenericInterface: mapping key can't map from / to 0 (bug#10259).
Backported apache2-httpd.include.conf to fix problems with newer apache setups.
Updated CPAN module Text::CSV to version 1.32 to fix utf-8 problems.
Fixed utf8 problems in scripts/test/CSV.t.
Fixed: mails with an empty return-path header must not trigger auto responses in OTRS (bug#10309).

Conflicts:
	CHANGES.md
Fixed: Special character in customer id cuts off string. (bug#10300).