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

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