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

This reverts commit 0e009ac4fe1d1efe8628a9125daab0562e23dc49.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the kobuki_desktop sub directory