[OE-3215 catch race condition where two users attempt to book the same operation at the same time.
Merge branch 'master' into release/1.4