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

This reverts commit 5c16df729f603a588e045c63070319455ebce822.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_description sub directory