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

This reverts commit 5731413fb11d1df73c7f55ef96a2ceeefeafbe21.
Rebase from 'upstream'
Trimmed the branch to only the carrot_planner sub directory