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

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