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

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