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

This reverts commit c413076cb1f03ed60c3579982c005f84d7583c47.
Rebase from 'upstream'
Trimmed the branch to only the scitos_common sub directory