Fix path conflict merge failures to unsubmit the change
Fix path conflict merge failures to unsubmit the change

When a path conflict was detected during a merge Gerrit failed to
unsubmit the change due to a data store API usage bug in the merge
service.  We actually marked the change unmerged, wrote it to the
data store, but then used a stale copy of the change (from prior
to the unsubmit) to record the path conflict message.  This meant
we overwrote the merge status flags, so the change still thought
it was pending merge.

Signed-off-by: Shawn O. Pearce <f3ea74d906fa9fe97c1fef6bad9cb871485c7045@google.com>

dwhipstock/gerrit,midnightradio/gerrit,anminhsu/gerrit,keerath/gerrit_newssh,WANdisco/gerrit,CandyShop/gerrit,catrope/gerrit,GerritCodeReview/gerrit,evanchueng/gerrit,gracefullife/gerrit,thesamet/gerrit,catrope/gerrit,ckamm/gerrit,gcoders/gerrit,basilgor/gerrit,GerritCodeReview/gerrit-attic,hdost/gerrit,Distrotech/gerrit,1yvT0s/gerrit,atdt/gerrit,GerritCodeReview/gerrit,netroby/gerrit,duboisf/gerrit,Shrews/PyGerrit,jackminicloud/test,zommarin/gerrit,MerritCR/merrit,ashang/aaron-gerrit,bootstraponline-archive/gerrit-mirror,gerrit-review/gerrit,Seinlin/gerrit,duboisf/gerrit,1yvT0s/gerrit,midnightradio/gerrit,teamblueridge/gerrit,TonyChai24/test,joshuawilson/merrit,hdost/gerrit,netroby/gerrit,anminhsu/gerrit,thesamet/gerrit,zommarin/gerrit,gcoders/gerrit,rtyley/mini-git-server,dwhipstock/gerrit,evanchueng/gerrit,renchaorevee/gerrit,CandyShop/gerrit,m1kah/gerrit-contributions,midnightradio/gerrit,qtproject/qtqa-gerrit,bootstraponline-archive/gerrit-mirror,sudosurootdev/gerrit,makholm/gerrit-ceremony,keerath/gerrit_newssh,basilgor/gerrit,thesamet/gerrit,Overruler/gerrit,pkdevbox/gerrit,Team-OctOS/host_gerrit,ashang/aaron-gerrit,netroby/gerrit,bpollack/gerrit,thinkernel/gerrit,jackminicloud/test,GerritCodeReview/gerrit,GerritCodeReview/gerrit,supriyantomaftuh/gerrit,jackminicloud/test,atdt/gerrit,gerrit-review/gerrit,Distrotech/gerrit,Shrews/PyGerrit,bpollack/gerrit,supriyantomaftuh/gerrit,quyixia/gerrit,anminhsu/gerrit,netroby/gerrit,bootstraponline-archive/gerrit-mirror,Shrews/PyGerrit,Saulis/gerrit,Saulis/gerrit,jeblair/gerrit,atdt/gerrit,TonyChai24/test,pkdevbox/gerrit,austinchic/Gerrit,thinkernel/gerrit,renchaorevee/gerrit,gracefullife/gerrit,thesamet/gerrit,gerrit-review/gerrit,Seinlin/gerrit,bpollack/gerrit,joshuawilson/merrit,Seinlin/gerrit,gracefullife/gerrit,TonyChai24/test,qtproject/qtqa-gerrit,Seinlin/gerrit,anminhsu/gerrit,MerritCR/merrit,supriyantomaftuh/gerrit,hdost/gerrit,renchaorevee/gerrit,bootstraponline-archive/gerrit-mirror,atdt/gerrit,Saulis/gerrit,keerath/gerrit_newssh,anminhsu/gerrit,gerrit-review/gerrit,cjh1/gerrit,teamblueridge/gerrit,skurfuerst/gerrit,MerritCR/merrit,Distrotech/gerrit,renchaorevee/gerrit,qtproject/qtqa-gerrit,ckamm/gerrit,supriyantomaftuh/gerrit,GerritCodeReview/gerrit,dwhipstock/gerrit,ckamm/gerrit,Team-OctOS/host_gerrit,makholm/gerrit-ceremony,quyixia/gerrit,zommarin/gerrit,midnightradio/gerrit,joshuawilson/merrit,qtproject/qtqa-gerrit,ckamm/gerrit,hdost/gerrit,joshuawilson/merrit,quyixia/gerrit,bpollack/gerrit,Distrotech/gerrit,Seinlin/gerrit,dwhipstock/gerrit,thinkernel/gerrit,gcoders/gerrit,skurfuerst/gerrit,rtyley/mini-git-server,sudosurootdev/gerrit,gracefullife/gerrit,supriyantomaftuh/gerrit,pkdevbox/gerrit,1yvT0s/gerrit,teamblueridge/gerrit,Distrotech/gerrit,gerrit-review/gerrit,Team-OctOS/host_gerrit,Overruler/gerrit,ckamm/gerrit,teamblueridge/gerrit,duboisf/gerrit,m1kah/gerrit-contributions,jackminicloud/test,evanchueng/gerrit,anminhsu/gerrit,GerritCodeReview/gerrit,austinchic/Gerrit,supriyantomaftuh/gerrit,renchaorevee/gerrit,gcoders/gerrit,jeblair/gerrit,jeblair/gerrit,qtproject/qtqa-gerrit,cjh1/gerrit,Team-OctOS/host_gerrit,netroby/gerrit,MerritCR/merrit,gracefullife/gerrit,GerritCodeReview/gerrit-attic,Team-OctOS/host_gerrit,Overruler/gerrit,Overruler/gerrit,Distrotech/gerrit,thinkernel/gerrit,hdost/gerrit,skurfuerst/gerrit,quyixia/gerrit,evanchueng/gerrit,quyixia/gerrit,joshuawilson/merrit,sudosurootdev/gerrit,Saulis/gerrit,m1kah/gerrit-contributions,basilgor/gerrit,Overruler/gerrit,quyixia/gerrit,qtproject/qtqa-gerrit,thesamet/gerrit,joshuawilson/merrit,qtproject/qtqa-gerrit,cjh1/gerrit,Shrews/PyGerrit,atdt/gerrit,evanchueng/gerrit,Overruler/gerrit,makholm/gerrit-ceremony,netroby/gerrit,CandyShop/gerrit,basilgor/gerrit,thesamet/gerrit,GerritCodeReview/gerrit,bootstraponline-archive/gerrit-mirror,teamblueridge/gerrit,renchaorevee/gerrit,thinkernel/gerrit,ashang/aaron-gerrit,1yvT0s/gerrit,pkdevbox/gerrit,pkdevbox/gerrit,thinkernel/gerrit,catrope/gerrit,MerritCR/merrit,MerritCR/merrit,netroby/gerrit,gcoders/gerrit,Distrotech/gerrit,pkdevbox/gerrit,WANdisco/gerrit,skurfuerst/gerrit,m1kah/gerrit-contributions,WANdisco/gerrit,makholm/gerrit-ceremony,gcoders/gerrit,keerath/gerrit_newssh,sudosurootdev/gerrit,bpollack/gerrit,midnightradio/gerrit,joshuawilson/merrit,CandyShop/gerrit,gerrit-review/gerrit,jackminicloud/test,Team-OctOS/host_gerrit,jackminicloud/test,WANdisco/gerrit,ashang/aaron-gerrit,WANdisco/gerrit,bpollack/gerrit,pkdevbox/gerrit,quyixia/gerrit,renchaorevee/gerrit,thinkernel/gerrit,supriyantomaftuh/gerrit,Saulis/gerrit,ashang/aaron-gerrit,hdost/gerrit,sudosurootdev/gerrit,dwhipstock/gerrit,MerritCR/merrit,austinchic/Gerrit,jackminicloud/test,cjh1/gerrit,WANdisco/gerrit,hdost/gerrit,TonyChai24/test,basilgor/gerrit,Seinlin/gerrit,TonyChai24/test,austinchic/Gerrit,bootstraponline-archive/gerrit-mirror,catrope/gerrit,dwhipstock/gerrit,anminhsu/gerrit,TonyChai24/test,joshuawilson/merrit,Seinlin/gerrit,thesamet/gerrit,jeblair/gerrit,zommarin/gerrit,gerrit-review/gerrit,keerath/gerrit_newssh,Saulis/gerrit,midnightradio/gerrit,GerritCodeReview/gerrit,Team-OctOS/host_gerrit,GerritCodeReview/gerrit-attic,MerritCR/merrit,gcoders/gerrit,dwhipstock/gerrit,WANdisco/gerrit,1yvT0s/gerrit,zommarin/gerrit,CandyShop/gerrit,TonyChai24/test,duboisf/gerrit