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

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