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

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