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

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