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

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