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

This reverts commit 0ba812ecb56dd128af869d8efdcc4e6588a0f226.
Rebase from 'upstream'
Trimmed the branch to only the kobuki_desktop sub directory