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

This reverts commit d5b6fb518c23057abc80c4dc9476248ba8c3317b.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the clients/rospy sub directory