back port of OC-10380 to 10-stable
Merge pull request #1141 from opscode/lcg/OC-10380-10-stable

back port of OC-10380 to 10-stable