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

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