Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus

* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

PHPBB3-12467
Merge pull request #2371 from nickvergessen/ticket/12467

[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore