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

This reverts commit a79d857c3972cd737c2ea73e5dd2fe4d67aba679.
Rebase from 'upstream'
Trimmed the branch to only the scitos_description sub directory