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

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