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

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