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

This reverts commit 344f0e049baaf089905801ae78b1829b5bf85d39.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the costmap_2d sub directory