Merge pull request #1912 from jessehu/CHEF-ISSUE-1904

retry on HTTP 50X Error when calling Chef REST API
Merge pull request #2151 from opscode/sersut/backport-chef-1912

Merge pull request #1912 from jessehu/CHEF-ISSUE-1904