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

This reverts commit 011a91be8dd654a528cf7c3aa1cec86976389a33.
Rebase from 'upstream' @ version '1.9.14'
Trimmed the branch to only the diagnostic_msgs sub directory