Merge branch 'develop-next' into 1.11.x

include/class.mailer.php

include/class.queue.php

include/class.search.php

include/class.ticket.php

include/client/templates/thread-entries.tmpl.php

include/client/tickets.inc.php

include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php

js/redactor-osticket.js

scp/js/scp.js