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

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