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

This reverts commit e5ae4c579cae816a923793640f0bec96a93ff951.
Rebase from 'upstream'
Trimmed the branch to only the costmap_2d sub directory