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

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