Bug 968793 - Wrong database upgrade. r=gene, r=jshih, a=fabrice