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

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