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

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