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

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