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

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