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

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