Revert "Trimmed the branch to only the test_diagnostic_aggregator sub directory"

This reverts commit 95b7da8f317553ad760141cee6aaab75a07a628e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the test_diagnostic_aggregator sub directory