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

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