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

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