[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks

PHPBB3-13232
[ticket/13232] Fix indentation

PHPBB3-13232
[ticket/13231] Update the dependencies of the migration contact_admin_form

PHPBB3-13231
[ticket/13232] Fix more issues with TTL and global cache file

PHPBB3-13232
Merge pull request #4 from nickvergessen/naderman-ticket/13232

[ticket/13232] Fix more issues with TTL and global cache file
[ticket/13227] Properly handle curlwrapper headers in remote avatars

Read a bit of the file to ensure header values are populated and then
handle headers in the nested array structure too.

PHPBB3-13227
[ticket/13229] Fix overloading memberlist with redundant SQL queries

PHPBB3-13229
Merge branch 'ticket/13229' into prep-release-3.1.0

* ticket/13229:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
Merge branch 'prep-release-3.1.0' into develop-ascraeus

* prep-release-3.1.0:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
Merge pull request #3083 from Nicofuma/ticket/13231

[ticket/13231] Update the dependencies of the migration contact_admin_form
Merge pull request #3085 from naderman/ticket/13227

[ticket/13227] Properly handle curlwrapper headers in remote avatars
[ticket/13232] Ensure prune cron job always gets run in prune test

The cron scheduler might pick a different task but we don't want to go
through them all to find the one we need. So we just make sure cron is
run at all and then manually run the one we want.

PHPBB3-13232
Merge branch 'prep-release-3.1.0' into develop-ascraeus

* prep-release-3.1.0:
  [ticket/13227] Properly handle curlwrapper headers in remote avatars
  [ticket/13231] Update the dependencies of the migration contact_admin_form
[ticket/13232] Fix spaces vs tabs

PHPBB3-13232
Merge branch 'naderman-ticket/13232' into prep-release-3.1.0
Merge branch 'prep-release-3.1.0' into develop-ascraeus