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

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