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

This reverts commit 5060c178bdd37f9456228b35440d1b1000461307.
Rebase from 'upstream' @ version '0.3.3'
Trimmed the branch to only the kobuki sub directory