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

This reverts commit 2ae33f158edbf421275ab56d89fe70665bfd8c77.
Rebase from 'upstream'
Trimmed the branch to only the base_local_planner sub directory