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

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