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

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