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

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