Revert "Trimmed the branch to only the jsk_tools sub directory"

This reverts commit 129802bf2e205f149b3e9005ba25b55f7810ff4a.
Rebase from 'upstream'
Trimmed the branch to only the jsk_tools sub directory