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

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