fix #3584: CHtmlTestModel: incorrect constructor
fix English typos in `UPGRADE` file
Merge branch 'fix-issue-3584'

Conflicts:
	CHANGELOG
Merge branch 'fix-typos-3586'