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

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