Ensure that we hold the exclusive database lock at the time we invoke
Database.close() during database upgrades.

Change-Id: I5a9f0c86a4802f6e253830424ea6d7a01d2e6f04