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

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