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

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