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

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