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

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