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

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