Fix merging of commits using GERRIT_CHANGES