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

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