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

This reverts commit e05fa89f5d1db3323a0d806615a8fe83740453a0.
Rebase from 'upstream'
Trimmed the branch to only the scitos_bringup sub directory