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

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