Fix db-upgrade.xml due to bad merge.