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

This reverts commit e1d54f8d83afe551c75f74a213430fe74b87b843.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosmaster sub directory