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

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