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

This reverts commit ef35ee9a25446c211ccb360207374ea699101669.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cob_srvs sub directory