Update UPGRADE.md
Merge branch '7.x-1.x' into 7.x-1.x-issue-354