update CHANGELOG.md for merge
update CHANGELOG.md for merge

BackSlasher/mixlib-shellout,juliandunn/mixlib-shellout,BackSlasher/mixlib-shellout,chef/mixlib-shellout,juliandunn/mixlib-shellout,chef/mixlib-shellout