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

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