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

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