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

This reverts commit b2e5adcdb65f216702a5b54fc4b331f367547107.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_tools sub directory