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

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