2.5 Migration Guide; Scaffold

More cleanup.  Added scaffold to the 2.5 migration guide.