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

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