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

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