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

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