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

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