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

This reverts commit e8aa5780773c292a966e111275f916e5bc1ba18b.
Rebase from 'upstream'
Trimmed the branch to only the clear_costmap_recovery sub directory