fixed a circular call (closes #6864)
Merge branch '2.0' into 2.1

* 2.0:
  fixed a circular call (closes #6864)
Merge branch '2.1' into 2.2

* 2.1:
  fixed a circular call (closes #6864)
  Correct comment in NativeSessionStorage regarding session.save_handler
  [Security] Add PHPDoc to AuthenticationEvents
Micro-optimization