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

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