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

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