Bug 4141 Reconcile 3.0.x and HEAD database updates for 3.2.0