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

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