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

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