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

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