Merge "Fix wrong attribute name used to restore databaseVersion."