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

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