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

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