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

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