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

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