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

This reverts commit 542f93dcbc47b140a5cad1c99b860e9105dd1591.
Rebase from 'upstream'
Trimmed the branch to only the tools/rosmaster sub directory