Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  AccountManager: Update display name only if it is not null.
  ChangeHookValidator: Fix old revision retrieval for root commit
  InlineEdit: Enable inline comments retrieval in change screen
  BanCommitCommand: Do not use commons.collections

Change-Id: Iddb4b9ea60428a271457c082b77afb787606dc24

gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java

@@ -329,6 +329,12 @@ public class ChangeInfo extends JavaScriptObject {
     }
 
     public static int findEditParent(JsArray<RevisionInfo> list) {
+      RevisionInfo r = findEditParentRevision(list);
+      return r == null ? -1 : r._number();
+    }
+
+    public static RevisionInfo findEditParentRevision(
+        JsArray<RevisionInfo> list) {
       for (int i = 0; i < list.length(); i++) {
         // edit under revisions?
         RevisionInfo editInfo = list.get(i);
@@ -340,12 +346,12 @@ public class ChangeInfo extends JavaScriptObject {
             String name = parentInfo.name();
             if (name.equals(parentRevision)) {
               // found parent pacth set number
-              return parentInfo._number();
+              return parentInfo;
             }
           }
         }
       }
-      return -1;
+      return null;
     }
 
     public final String id() {