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

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