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

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