Merge branch 'stable-2.9'

* stable-2.9:
  Replace icon for merge commit
  Make EmailArguments public to allow sending mails from plugins

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java

Change-Id: Icbf07da888ec07fc60409c1d987cf96359f3533d

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java

@@ -79,6 +79,6 @@ public interface GerritResources extends ClientBundle {
   @Source("listAdd.png")
   public ImageResource listAdd();
 
-  @Source("important.png")
-  public ImageResource important();
+  @Source("merge.png")
+  public ImageResource merge();
 }

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml

@@ -131,7 +131,7 @@ limitations under the License.
           </div>
           <g:Image
               ui:field='mergeCommit'
-              resource='{ico.important}'
+              resource='{ico.merge}'
               visible='false'
               title='Merge Commit'>
             <ui:attribute name='title'/>

gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java

@@ -42,7 +42,7 @@ import org.apache.velocity.runtime.RuntimeInstance;
 
 import java.util.List;
 
-class EmailArguments {
+public class EmailArguments {
   final GitRepositoryManager server;
   final ProjectCache projectCache;
   final GroupBackend groupBackend;