Backport https://bugs.launchpad.net/nova/+bug/1229475

Above bug seems similar to the race condition hit in 1371592.

Partial-Bug: #1371592
Merge pull request #3 from Juniper/backport_race_cond

Backport https://bugs.launchpad.net/nova/+bug/1229475