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

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