Merge branch 'MDL-29470-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
MDL-34198 SCORM remove unecessary get_records call
MDL-34175 automatically fix admin JS links
MDL-34175 a few more renamed admin fixes

Conflicts:

	admin/tool/assignmentupgrade/batchupgrade.php
	admin/tool/assignmentupgrade/index.php
	admin/tool/assignmentupgrade/listnotupgraded.php
	admin/tool/assignmentupgrade/upgradesingle.php
	admin/tool/assignmentupgrade/upgradesingleconfirm.php
MDL-34155 use course visibility default when creator does not have moodle/course:visibility
Merge branch 'MDL-34171_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
MDL-28155 mod_assignment - Fix an ugly hack

Show download all link for any assignment types which implement
the download_submissions() method
MDL-33712 add support for unique moodle tags in tinymce
Automatically generated installer lang files
MDL-28155 mod_assignment Using the this object instead of a string
MDL-34175 one more hardcoded /admin/ in mnet
Automatically generated installer lang files
MDL-32297 Forms: Date Picker JS popup is not constraint to parent form
MDL-31169 theme_base: adds clearfix to page layouts so body height is not zero
MDL-32582 - filter/multimedia: MP3 Flow Player doesn't work in Chrome if empty stylesheets are present
Revert "MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results"

This reverts commit ccef0a8b0aa9e02ee67362dc9e6d0fed29a1089b.
Merge branch 'MDL-32297-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
weekly release 2.2.4+
MDL-34271 cleanup mysql engine hack before adding similar collation hack