Revert "Trimmed the branch to only the tools/rosparam sub directory"

This reverts commit 7988d4e81d711b125881cf4ed2cd2759699fd9b7.
Rebase from 'upstream'
Trimmed the branch to only the tools/rosparam sub directory