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

This reverts commit 502a4c9af341afcc4c239530b620a9224a2935b3.
Rebase from 'upstream'
Trimmed the branch to only the clearpath_base sub directory