Deprecate --distro and --template-file options in favor of --template.
Remove encrypted_data_bag_secret distribution via Chef::Config and enable distributing it via knife[:secret] and knife[:secret_file].