MDL-42728 Merge English strings from the en_fix language pack
MDL-38743 add private cache headers
Merge branch 'MDL-42728-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE
Merge branch 'MDL-42605-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Merge branch 'MDL-42666-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
MDL-42668 portfolio_boxnet: Migration to APIv2

Conflicts:

	lib/boxlib.php
	portfolio/boxnet/lib.php
MDL-42668 portfolio_boxnet: Notify the admins about the upgrade process

Conflicts:

	portfolio/boxnet/version.php
MDL-42668 portfolio_boxnet: Disable the portfolio during upgrade
MDL-42668 portfolio_boxnet: Disable the portfolio when non-HTTPS