Bug 842917 - Avoid nested transactions in onUpgrade r=lucasr
Bug 843029 - Add more retries to ensureDatabaseIsNotLocked r=blassey r=lucasr