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

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