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

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