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

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