Update trackupstream for C:OS:Folsom

We don't want to track upstream for python-*client (since there's no
stable branch there).

Also track cinder.