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

This reverts commit 5133821ba158a4b2a1893d77c967ee64449e4715.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cob_common sub directory