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

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