Revert "Trimmed the branch to only the clients/rospy sub directory"

This reverts commit e921868bfbfb887f883abb5e4efece6c21190047.
Rebase from 'upstream'
Trimmed the branch to only the clients/rospy sub directory