Merged r9701 from trunk.
Fixed test failures on wiki_page updated_on eager loading (#10996).
Fixed time zone issues introduced by r9719 (#10996).
Merged r9710 from trunk.
Merged r9711 from trunk.
Merged r9718 from trunk.
Merged r9712 from trunk.
Merged r9709 from trunk.
Merged r9699 from trunk.
Restores local time zone for timestamps for 1.x compatibility (#10996).
