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

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