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

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