Updating Elastica to master, pulls in Nik's retry_on_conflict work

Change-Id: I5dae4fabb24b495f534b1e48a56eee622b325f1d