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

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