PHOENIX-60 UPSERT SELECT only committing last row sometimes (JamesTaylor)
Merge remote-tracking branch 'asf/master'