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

This reverts commit 491f31a17de9ed94be9a770f32dd2ece13907970.
Rebase from 'upstream' @ version '1.7.10'
Trimmed the branch to only the test_diagnostic_aggregator sub directory
Revert "Trimmed the branch to only the test_diagnostic_aggregator sub directory"

This reverts commit a13f4443873994c60951819920aeb11ab526e709.
Trimmed the branch to only the test_diagnostic_aggregator sub directory
Revert "Trimmed the branch to only the test_diagnostic_aggregator sub directory"

This reverts commit a2a8fa7e0a768a4f2a5e6094dcd9190f3af055a5.
Rebase from 'upstream' @ version '1.7.10'
Trimmed the branch to only the test_diagnostic_aggregator sub directory