Backed out changeset 22ff9f4b16ff
Database.list must set manually the flavor

issue3508
review2121002
Remove unused regexp

review2081002