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

This reverts commit 54e55b49667b4c4653dd172e941f5c03e7d76f78.
Rebase from 'upstream'
Trimmed the branch to only the kobuki_soft sub directory