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

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