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

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