Changes to remove redundant code and use chef/util/diff for knife diff