[ticket/10772] Remove 3.1 code

PHPBB3-10772
[ticket/10772] Updating tests

PHPBB3-10772
Merge branch 'develop-olympus' into develop with no effect

No changes!

* develop-olympus:
  [ticket/10772] Updating tests
  [ticket/10772] Remove 3.1 code