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

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