Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Align delete refs to the rest of Gerrit

Release-Notes: skip
Change-Id: Ide7432445a82dd30a4c8a50a69b75cba58eaeae3

java/com/google/gerrit/server/StarredChangesUtil.java

diff --git a/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java
index f7193b7..cad935b 100644
--- a/java/com/google/gerrit/server/StarredChangesUtil.java
+++ b/java/com/google/gerrit/server/StarredChangesUtil.java
@@ -459,6 +459,7 @@
       RefUpdate u = repo.updateRef(refName);
       u.setForceUpdate(true);
       u.setExpectedOldObjectId(oldObjectId);
+      u.setNewObjectId(ObjectId.zeroId());
       u.setRefLogIdent(serverIdent.get());
       u.setRefLogMessage("Unstar change", true);
       RefUpdate.Result result = u.delete();

java/com/google/gerrit/server/edit/ChangeEditUtil.java

diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
index 6b018ce..3540081 100644
--- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java
+++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
@@ -241,6 +241,7 @@
     String refName = edit.getRefName();
     RefUpdate ru = repo.updateRef(refName, true);
     ru.setExpectedOldObjectId(edit.getEditCommit());
+    ru.setNewObjectId(ObjectId.zeroId());
     ru.setForceUpdate(true);
     RefUpdate.Result result = ru.delete();
     switch (result) {