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

This reverts commit 1d1e853c6337b602b56b82015cc0826cf0e7f21c.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the tools/rosmaster sub directory