Merge branch 'stable-2.5'

* stable-2.5:
  Enables the use of session management in Jetty.