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

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