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

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