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

This reverts commit c1a8d6b8d04de5ebc987569c6c8f4d47066afb9e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_common sub directory