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

This reverts commit 0aca88c76339157ee145e61c47da5fc78d31e9f8.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_apps sub directory