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

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