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

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