Comment 10 for bug 1651768

Tests were restored by https://review.openstack.org/#/c/462749/

There have been a few changes that should enable these tests to succeed on a regular basis, all related to edge cases around updating a resource's atomic_key and metadata: Corrected max secs for concurrent trans retries e37d9fab8fe2e779ae8c0e2311de2601b66c66b6 Don't set metadata for deleted resources 8d7e3e41e8f02726dca33b5ec2f6d5b6b6b07a31 Allow retries when resource acquires lock 2ec2d5a973927f9a2cc2a62f70712afc5cb30f4c

In addition to the patch above, the fixes were:
https://review.openstack.org/#/c/449286/
https://review.openstack.org/#/c/449351/