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

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