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

This reverts commit 99aa02d342c295a55de8d8e0e51afef2d17b2201.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the clear_costmap_recovery sub directory