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

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