Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_common sub directory
Revert "Trimmed the branch to only the jsk_common sub directory"

This reverts commit 043f3f727955b65be26e56a11055720eeef38217.
Rebase from 'upstream'
Trimmed the branch to only the jsk_common sub directory