Corrections for UPGRADE.md, and branch alias for composer.json