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

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