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

This reverts commit 8a86b78604bf2bbc8ecdc0d1c7beafe838904dcb.
Rebase from 'upstream'
Trimmed the branch to only the cob_srvs sub directory