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

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