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

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