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

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