Merge conflict caused the inclusion of the template to be lost

Crowdin seems to have difficulty parsing YAML files with spaces between list
items. This patch avoids the issue by removing unnecessary empty lines in
the file.

Conflicts:
	include/client/tickets.inc.php
	include/staff/settings-tickets.inc.php
	include/upgrader/streams/core/8f99b8bf-00000000.patch.sql
	scp/css/scp.css
	setup/inc/streams/core/install-mysql.sql

Merging feature/multilingual-phase-ii

Conflicts:
	include/class.config.php
	include/class.dynamic_forms.php
	include/class.forms.php
	include/class.ticket.php
	include/staff/dynamic-list.inc.php
	include/staff/dynamic-lists.inc.php
	include/staff/filter.inc.php
	include/staff/helptopic.inc.php
	include/staff/settings-tickets.inc.php
	include/staff/templates/list-item-properties.tmpl.php
	include/staff/ticket-view.inc.php
	scp/lists.php
	scp/tickets.php

And fixup the migration patch

Crowdin recreates YAML files with indent specifications which Spyc does not
currently handle:

body: |2
  body contents written
  here with 2 leading spaces

This is part of the Yaml spec after 1.0

backportme

Implement the logic to set status

Help topics and filters can override the default status

Conflicts:
	include/ajax.tickets.php
	include/ajax.users.php
	include/class.dynamic_forms.php
	include/class.email.php
	include/class.misc.php
	include/staff/emails.inc.php
	include/staff/templates/user-register.tmpl.php
	login.php
	setup/inc/install-done.inc.php

Changed Resolved to resolved state
Add ability to get statuses by states