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

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