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

This reverts commit 9127bcf06c32c184a17b27d92c7f666b3ae66301.
Rebase from 'upstream'
Trimmed the branch to only the scitos_drivers sub directory