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

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