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

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