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

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