db/upgrade.php: Fix upgrade issues
Changelog.txt: Update changelog for version 2.2.3.1