Fixes #5745: Do the configid migration properly
Merge pull request #520 from Kegeruneku/bug_5745/int/5745_fix_configid_migration

Fixes #5745: Do the configid migration properly