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

This reverts commit 8ba253cfe762edb851c4bd77d1793df9df6a8552.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the clear_costmap_recovery sub directory