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

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