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

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