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

This reverts commit c5217f899ec733d5506fa3ca7995939da1ec90e0.
Rebase from 'upstream'
Trimmed the branch to only the jsk_tools sub directory