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

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