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

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