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

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