[Bug 394343] Updating from Beta3plus to current factory gives errors