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

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