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

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