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

This reverts commit bab80e346c062c93982da718c6bddb5f43c0afb9.
Rebase from 'upstream'
Trimmed the branch to only the tools/rosmake sub directory