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

This reverts commit 14140ba61a41ba486c7201ab6295d1ae8fa46253.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosmaster sub directory