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

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