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

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