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

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