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

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