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

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