Change database unique together from (database, environment) to (database, databaseinfra)
mege from master
Change metrics config to not pass time from
Remove checks from database admmin and its tests
Change metrics config to not pass time from
merge