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

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