Cleanup and resync.

Note the XML is cleaned up but incomplete as actual initial changes to create the 2.8 branch have not been applied yet - it's a clone of 2.7.2.6 currently.