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

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