Update UPGRADE-2.1.md

Tweaks to the grammar used to make the upgrade text more readable
Merge pull request #1395 from caponica/master

Minor changes to make upgrade text more readable
Update UPGRADE-2.2.md
Fix form template regression
Fix unit tests
Merge branch 'sonata/master'