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

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