Fixed the two upgrade scripts breaking the migration from 1.0 to 1.1

By fixing only two scripts I was able to manually upgrade a 1.0 database in a reasonable amount of time.
However we cannot keep the ruptures in pickled format, otherwise future migrations will be a nightmare.
See https://bugs.launchpad.net/oq-engine/+bug/1274838