Changes for 2.2.0-M1 release.
Changes for 2.1.6 release, and possibly some final polishes for 2.2.0-M1 release.