Merge globus-connect-server changes from CVS