cut off pydi uri for service url when authenticate via CAS
Merge remote-tracking branch 'upstream/develop' into 2011