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

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