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

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