* stable-2.5:
NPE when strategy is cherry-pick and changeMerge.test enabled
Fix owner column to link to same status
Sort groups on the group list screen
Documentation: Add link to test-submit-rule from the prolog cookbook.
Do not log RepositoryNotFoundException if non-existing project is accessed
Documentation: Add submit rule example on how to implement 1+1=2
Fix OutOfScope exception when auditing ssh auth failure.
Fix a NPE caused by GerritCall.getMethod returning null.
Add org.apache.mina as dependency to pom.xml
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
Change-Id: Id280ca6afebbe299e5841ddf8850184714f70de7
6738e5f340