Merge branch 'release/1.7-RC5'

include/client/knowledgebase.inc.php

include/mysql.php

include/staff/apikey.inc.php

include/staff/cannedresponses.inc.php

include/staff/department.inc.php

include/staff/directory.inc.php

include/staff/faq-categories.inc.php

include/staff/faq.inc.php

include/staff/filter.inc.php

include/staff/header.inc.php

include/staff/helptopic.inc.php

include/staff/settings-emails.inc.php

include/staff/settings-kb.inc.php

include/staff/settings-tickets.inc.php

include/staff/team.inc.php

include/staff/ticket-view.inc.php

include/staff/tickets.inc.php

include/upgrader/sql/435c62c3-2e7531a2.patch.sql

include/upgrader/sql/98ae1ed2-e342f869.patch.sql

include/upgrader/sql/9f3b454c-c0fd16f4.patch.sql