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

This reverts commit 62cf6f592471c78bad9536c9211bc36dfb90ca78.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the carrot_planner sub directory