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

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