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

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