Forward port 3.5.4 to 3.5.5 db upgrade script