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

This reverts commit f815482eb0064fb6ddc52167e09d5916eddf30e6.
Rebase from 'upstream'
Trimmed the branch to only the scitos_teleop sub directory