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

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