Btm/chef 4760 knife logging rebase

Rebase of #1148