fix merge conflict: recent VOMS update required changes in how client_name was used
fix merge conflict: recent VOMS update required changes in how
client_name was used

gridcf/gct,globus/globus-toolkit,globus/globus-toolkit,ellert/globus-toolkit,gridcf/gct,ellert/globus-toolkit,globus/globus-toolkit,globus/globus-toolkit,gridcf/gct,ellert/globus-toolkit,ellert/globus-toolkit,gridcf/gct,globus/globus-toolkit,ellert/globus-toolkit,ellert/globus-toolkit,ellert/globus-toolkit,globus/globus-toolkit,gridcf/gct,globus/globus-toolkit,ellert/globus-toolkit,gridcf/gct,globus/globus-toolkit