Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  OutputStreamQuery: Only return current patch set when visible to user
  Fix NPE in SubmitRuleEvaluator

Change-Id: Id40335752bbe67cc74552260445b29223da4eebd

gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java

@@ -440,6 +440,11 @@ public abstract class AbstractDaemonTest {
     return push.to(ref);
   }
 
+  protected PushOneCommit.Result amendChangeAsDraft(String changeId)
+      throws Exception {
+    return amendChange(changeId, "refs/drafts/master");
+  }
+
   protected ChangeInfo info(String id)
       throws RestApiException {
     return gApi.changes().id(id).info();