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).
Fixed that plugin model generator does not generate the migration (#11024).
Code cleanup.
