I apologize so much for posting when I did not need to.
For some reason did I not scroll down on the above mentioned post,
but of cause there was the answer to all my problems.
Just for reference, here is what I did:
ALTER TABLE journal_settings ALTER COLUMN setting_type DROP NOT NULL;
ALTER TABLE author_settings ALTER COLUMN setting_type DROP NOT NULL;
After this the upgrade went fine!
Thanks a lot!