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

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