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

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