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

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