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

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