Merge remote branch 'upstream/develop' into develop-next

Apply changes made to v1.9.5

Conflicts:
	attachment.php
	include/ajax.draft.php
	include/ajax.tickets.php
	include/class.attachment.php
	include/class.dept.php
	include/class.dynamic_forms.php
	include/class.faq.php
	include/class.file.php
	include/class.http.php
	include/class.nav.php
	include/class.page.php
	include/class.staff.php
	include/class.thread.php
	include/class.ticket.php
	include/client/faq.inc.php
	include/client/tickets.inc.php
	include/staff/cannedresponses.inc.php
	include/staff/categories.inc.php
	include/staff/category.inc.php
	include/staff/department.inc.php
	include/staff/departments.inc.php
	include/staff/directory.inc.php
	include/staff/emails.inc.php
	include/staff/faq-view.inc.php
	include/staff/faq.inc.php
	include/staff/group.inc.php
	include/staff/groups.inc.php
	include/staff/helptopic.inc.php
	include/staff/page.inc.php
	include/staff/pages.inc.php
	include/staff/slaplan.inc.php
	include/staff/slaplans.inc.php
	include/staff/staff.inc.php
	include/staff/staffmembers.inc.php
	include/staff/system.inc.php
	include/staff/team.inc.php
	include/staff/teams.inc.php
	include/staff/template.inc.php
	include/staff/tickets.inc.php
	include/staff/users.inc.php
	scp/attachment.php
	scp/canned.php