CLC-2192 Use retriable to get around race conditions in first_or_create and first_or_initialize
Merge pull request #1292 from ctweney/clc-2192

CLC-2192 Use retriable to get around race conditions in first_or_create and first_or_initialize