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

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