Post-clone cleanup.

Submitting for integration. Thanks Helen Foster for your work on this.

As David Mo mentioned the other day, we need to do a full behat run on these to make sure its not going to cause all kinds of failures.

I will try that now.

Looks good on master:
281 scenarios (281 passed)
6058 steps (6058 passed)
203m27.606s

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

FYI, it seems that, in master, you are re-introducing a missing string (lang/en/moodle.php):

<<<<<<< HEAD
=======
$string['resortselectedcategoriesby'] = 'Re-sort subcategories of selected categories';
>>>>>>> FETCH_HEAD

I've integrated this - thanks.

I removed that added string. I will run behat now again.

Thanks guys. Correct - when those en_fix branches were created, the string was still in moodle.git. Thanks for spotting it.

Waiting for the CI server to finish, I see 2 failures, once the job is finished I will check if they are caused by those language strings changes.

sorry Dan, I didn't see your comment above, passing it.

Here lies 52 bugs.
All fixed or swept under a rug.
If they come back one day,
To our dismay,
We all will feel quite un-smug.

Thanks for the reporting/fixing/testing on this issue. It has been sent upstream.