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

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