GT-546 fix
Merge branch 'globus_5_2_branch' of https://github.com/globus/globus-toolkit into globus_5_2_branch