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

This reverts commit 955fec787685f1eedcb7f236e647ddd99e60e7b2.
Rebase from 'upstream'
Trimmed the branch to only the scitos_apps sub directory