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

This reverts commit 59a631b8559971cc3d4c4646fa913fa0b848f11f.
Rebase from 'upstream' @ version '1.7.10'
Trimmed the branch to only the diagnostic_aggregator sub directory
Revert "Trimmed the branch to only the diagnostic_aggregator sub directory"

This reverts commit cced389cea6af6c04349f9c7bc9557db4bcfa2d4.
Trimmed the branch to only the diagnostic_aggregator sub directory
Revert "Trimmed the branch to only the diagnostic_aggregator sub directory"

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