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

This reverts commit f744393e520bb7fbf7d19f2dc30885f04ba2f75b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the diagnostic_msgs sub directory