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

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