rebase
unit test for secret file discovery
add CHANGELOG for pr/1577
Merge pull request #2031 from opscode/lcg/1577

Rebase and ChangeLog for PR 1577