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

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