Dry admin logs.
Merge pull request #7961 from cirosantilli/dry-log-file-names

Factor admin logs [failure unrelated]