Merge tag 'refs/tags/changes/67' into testing
Merge branch 'testing_109' of github.com:Netflix/aminator into chef