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

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