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

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