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

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