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

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