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

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