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

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