PHOENIX-1289 Drop index during upsert may abort RS (daniel meng + jyates)