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

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