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

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