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

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