Merge branch 'MDL-36092-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
NOBUG: Trivial whitespace fix to quickly fix ongoing CI status.
MDL-36196 hardcode the required PHP version in installer
MDL-35558 mod_data: Show only own entries while there are required pending.
MDL-35249 - Move Grading popmenu "userid" column after "scale" column (workaround)

Conflicts:

	mod/assign/gradingtable.php
Merge branch 'MDL-36271_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
MDL-36197 theme_fusion: Fix for "Your progress" overlaps completion tracking checkbox
MDL-33791 Portfolio: Fixed security issue with passing file paths.
MDL-36433 Forms lib - Added dash escaping to validation script getter.
MDL-36051 - Quick Grading in Assignment module does not turn on in some circumstances
* Fixed bug with quick grading when file submission is turned off
MDL-36422 question: Fixed malformed HTML in manual marking
Merge branch 'MDL-36422-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
MDL-27824 - course category: add check test for ->coursesperpage value.
MDL-27824 course categories: Added @todo comments to remove the temporary fix
MDL-27824 course categories: change isset() to empty()
MDL-27824 course categories: remove trailing whitespace
Merge branch 'MDL-27824_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Merge branch 'MDL-36051_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
Merge branch 'w45_MDL-36196_m23_vercheck' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Merge branch 'MDL-35349_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE