Merged updates from feature/82979704_jrubin_update_envetcd_with_output_file_option
Update to include use of --output option