Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)

105366: SHA-957: Create New Email Template
     - Fixed InviteSenderTest


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

source/test-java/org/alfresco/repo/invitation/site/InviteSenderTest.java

@@ -113,7 +113,8 @@ public class InviteSenderTest extends TestCase
             String emailTemplateXpath, String emailSubjectKey, boolean requireAcceptance) throws Exception
     {
         String rolePropertyName = "invitation.invitesender.email.role.Role";
-        String subjectPropertyName = "invitation.invitesender.email.subject";
+        String subjectPropertyName = 
+                requireAcceptance ? "invitation.invitesender.email.subject" : "invitation.invitesender.emailAddDirect.subject";
 
         String subjectMsg = "Subject message";