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

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