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

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