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

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