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

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