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

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