Fix initialization order problem in tests.
Merge branch '2.2.x_2.10' into 2.3.x_2.10
The real regression is a lazy val in a trait.
Merge branch '2.2.x_2.10' into 2.3.x_2.10
[feature] Migrated to atmosphere 2.0.3 from atmosphere 1.0.12
Merge branch '2.3.x_2.10-atmosphere2' of https://github.com/adamretter/scalatra into 2.3.x_2.10-atmosphere2