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

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