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

This reverts commit 608752cbe31ea5f64dfb2f19684511563ae834c8.
Rebase from 'upstream'
Trimmed the branch to only the diagnostic_msgs sub directory