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

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