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

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