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