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

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