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

This reverts commit b394af26afea37aced1c6e5f5c4980245f0fd485.
Rebase from 'upstream' @ version '1.9.12'
Trimmed the branch to only the diagnostic_msgs sub directory