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

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