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

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