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

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