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

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