Add support for diagnostic tags, and use them for mergeDefaultSetupAndUserConfigs
#8433
| Job | Run time |
|---|---|
| 1m 14s | |
| 1m 13s | |
| 1m 20s | |
| 1m 31s | |
| 6m 57s | |
| 1m 15s | |
| 1m 17s | |
| 1m 26s | |
| 1m 12s | |
| 6m 17s | |
| 1m 10s | |
| 24m 52s |