MDL-25248 undo crazy resource hardlinking hacks before upgrade
weekly release 2.2.10+
Merge branch 'MOODLE_22_STABLE' into MOODLE_22_BFC