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

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