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

This reverts commit c6cdda914684a21fe371b4b6f71cf538cac14b99.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_drivers sub directory