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

This reverts commit 9ea59dcaa504c4a46f7e87801e7493deaa3eb649.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cob_scan_unifier sub directory