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

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