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

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