Add support for diagnostic tags, and use them for mergeDefaultSetupAndUserConfigs
#8432
| Job | Run time |
|---|---|
| 1m 13s | |
| 1m 7s | |
| 9m 21s | |
| 1m 33s | |
| 1m 24s | |
| 1m 26s | |
| 1m 22s | |
| 1m 31s | |
| 1m 9s | |
| 5m 7s | |
| 1m 18s | |
| 26m 31s |