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

This reverts commit 8b48bd240c654a891ece52ff8ed1cbf7f272134a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosparam sub directory