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

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