Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666

Conflicts:
	projects/cadcAccessControl-Server/build.xml
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GetGroupNamesAction.java

projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java

@@ -141,11 +141,11 @@ public class GMSClient
         try
         {
             URL testURL = new URL(baseURL);
-            if (!testURL.getProtocol().equals("https"))
-            {
-                throw new IllegalArgumentException(
-                        "URL must have HTTPS protocol");
-            }
+//            if (!testURL.getProtocol().equals("https"))
+//            {
+//                throw new IllegalArgumentException(
+//                        "URL must have HTTPS protocol");
+//            }
         }
         catch (MalformedURLException e)
         {
@@ -584,7 +584,7 @@ public class GMSClient
         throws GroupNotFoundException, UserNotFoundException, AccessControlException, IOException
     {
         String userIDType = AuthenticationUtil.getPrincipalType(userID);
-        String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8");
+        String encodedUserID = URLEncoder.encode(userID.getName(), "UTF-8");
         URL addUserMemberURL = new URL(this.baseURL + "/groups/" + 
                                        targetGroupName + "/userMembers/" + 
                                        encodedUserID + "?idType=" + userIDType);