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

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