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

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