Comment 9 for bug 1651768

Reviewed: https://review.openstack.org/466008
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=c52fdbb7d68bb0814843f3fec9b2d966239bab40
Submitter: Jenkins
Branch: stable/newton

commit c52fdbb7d68bb0814843f3fec9b2d966239bab40
Author: Zane Bitter <email address hidden>
Date: Thu May 26 13:40:53 2016 -0400

    Corrected max secs for concurrent trans retries

    This was most likely meant as a max 2s delay here, not a max 2ms
    delay.

    Also includes a related change: when retries for metadata updates are
    attempted, make sure we do not have a stale value of the atomic_key
    (otherwise we'll just inevitably hit the ConcurrentTransaction issue).

     Conflicts:
     heat/engine/service_software_config.py
     heat/objects/resource.py

    Co-Authored-By: Crag Wolfe <email address hidden>
    Partial-Bug: #1651768
    Change-Id: Ie56e0e4ff93633db1f4752859d2b2a9506922911
    (cherry picked from commit e37d9fab8fe2e779ae8c0e2311de2601b66c66b6)