Merge osticket/v1.9.6.1 into develop-next

Conflicts:
	include/class.thread.php
	include/class.ticket.php
	include/class.user.php
	include/pear/Mail.php
	include/staff/orgs.inc.php
	include/staff/ticket-view.inc.php
	include/staff/users.inc.php
	scp/js/scp.js
	setup/test/tests/stubs.php