Copy the 4.0.19 upgrade step into 4.2.2 as well, for users already on 4.2
Add incremental upgrade steps for 4.0.19, 4.2.1, and 4.2.2
Merge branch '4.2.2-releng' into 4.2-trunk