MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled
MDL-37280 remove bogus lang_string causing fatal error

Credit goes to Lorenzo Nicora, thanks.
MDL-37068 qformat_learnwise: fix UTF8 and other issues.
Automatically generated installer lang files
MDL-27884 Implement proper username validation during csv import
MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course
Merge branch 'MDL-36741_m22' of git://github.com/markn86/moodle into MOODLE_22_STABLE
Merge branch 'w51_MDL-37280_m22_langstring' of git://github.com/skodak/moodle into MOODLE_22_STABLE
Merge branch 'MDL-16730-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
MDL-4781 forum: show discussion link when user has ability to view discussion

Conflicts:
	mod/forum/lib.php
Merge branch 'MDL-37068_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
Merge branch 'MDL-37161-moodle22' of https://github.com/StudiUM/moodle into MOODLE_22_STABLE
MDL-35991 - use PARAM_LOCALURL for local urls

Conflicts:
	user/files.php
MDL-33340 completion: Incorrect logic in hidden field check

Credit to Jody Steele
MDL-36977 Add more unit tests for moodle1 backup conversion
MDL-36977 Be more picky when it comes to migrating files in moodle1 backups
MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs

Conflicts:
	blog/rsslib.php
MDL-37420 add support for more PostgreSQL schemas
MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing

Credit goes to Aurelijus Bruzas, thanks.
MDL-36600 user: improve course messaging checks