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

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