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

This reverts commit 91c9488cb44992d7280102fb7050c265632277ad.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the base_local_planner sub directory