ac2 - fixed merge conflicts in AbstractExecutor, GMSClient

import javax.net.ssl.SSLSocketFactory;

import javax.security.auth.Subject;

import ca.nrc.cadc.ac.*;

import ca.nrc.cadc.auth.HttpPrincipal;

import org.apache.log4j.Logger;

import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.GroupAlreadyExistsException;

import ca.nrc.cadc.ac.GroupNotFoundException;

import ca.nrc.cadc.ac.Role;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.xml.GroupListReader;

import ca.nrc.cadc.ac.xml.GroupReader;

import ca.nrc.cadc.ac.xml.GroupWriter;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.auth.SSLUtil;

import ca.nrc.cadc.net.HttpDownload;

import ca.nrc.cadc.net.HttpPost;

import ca.nrc.cadc.net.HttpTransfer;

import ca.nrc.cadc.net.HttpUpload;

import ca.nrc.cadc.net.InputStreamWrapper;

import ca.nrc.cadc.net.NetUtil;

            }

        });

        // Disable retries.

        httpDownload.setRetry(0, 0, HttpTransfer.RetryReason.NONE);

        httpDownload.setSSLSocketFactory(getSSLSocketFactory());

        httpDownload.run();