Merge "[FileJournal] Made getMasterDB() reuse the DB handle."