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

This reverts commit 036fc429bba2039e5fe3e9016147cce4d3d5eee3.
Rebase from 'upstream'
Trimmed the branch to only the smach_ros sub directory