Checkin to update a bunch of documentation and support for 2.1 format changes.