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

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