Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

73350: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73193: Merged DEV to V4.2-BUG-FIX (4.2.3)
        73075: MNT-8886 Users with disabled accounts receive email notification from workflow 


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

source/java/org/alfresco/repo/action/executer/MailActionExecuter.java

@@ -488,8 +488,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
             else 
             {
                     for (MimeMessageHelper message : finalMessages) {
+                    if (message != null)
+                    {
                         sendEmail(ruleAction, message);
                     }
+                    }
             }
         }
 
@@ -933,6 +936,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
             {
                 logger.warn("Unable to prepare mail message. Skipping.", e);
             }
+            return null;
         }
         
         return messageRef[0];