Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

93264: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93239: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93194: MNT-12991 : Disabled users can be invited in site
            - Resolved build failures, corrected tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/web/scripts/invite/Invite.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -238,10 +238,7 @@ public class Invite extends DeclarativeWebScript
             }
             catch (InvitationExceptionUserError ie)
             {
-                throw new WebScriptException(Status.STATUS_CONFLICT,
-                    "Cannot proceed with invitation. A person with user name: '" + inviteeUserName
-                    + "' and invitee email address: '"
-                    + inviteeEmail + "' is already a member of the site: '" + siteShortName + "'.");
+                throw new WebScriptException(Status.STATUS_CONFLICT, ie.getMessage());
             }
             catch (InvitationExceptionForbidden fe)
             {