Sync db upgrade with db install to avoid silly upgrade errors
Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix

Sync db upgrade with db install to avoid silly upgrade errors