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

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