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

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