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

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