Squashed 'admin/tool/sync/' changes from c842ab7..7e13a95

7e13a95 fix 2.5 and add cohorts

git-subtree-dir: admin/tool/sync
git-subtree-split: 7e13a953d86774269076bbcc831bdb61097969e3
Merge commit '04fbf9434caea2e0a193b6a349e0d717d9d4eefd' into ced-MOODLE_25_STABLE