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

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