MDL-38003 upgrade: ensure specific columns are set to not null during upgrade from < 1.7 to 2.x