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

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