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

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