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

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