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

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