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

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