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

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