Remove trailing spaces in Emacs templates
Merge branch 'jwh/httpc_delete_body/OTP-11190' into maint

* jwh/httpc_delete_body/OTP-11190:
  httpc: Allow content body in DELETE requests
Merge branch 'dg/win_icon' into pu
Merge branch 'ao/fix_mnesia_block_table_exception' into pu
Merge branch 'sze/ssh_cli_handles' into pu
Merge branch 'sze/edlin_understand_keys' into pu
Merge branch 'sze/limit_max_length_int_shell' into pu
Merge branch 'yi/fix_eunit_io_protocol' into pu
Merge branch 'nox/fix-fname-inlining' into pu
Merge branch 'nox/igor-funs' into pu
Merge branch 'sze/to_erl' into pu
Merge branch 'feat/erl_tidy_print_to_stdout' into pu
Merge branch 'epa/fix_io_noreturn_with_self_pid' into pu
Merge branch 'nox/fix-erl_lint-variable-usage' into pu
Merge branch 'nox/fix-comp-warnings' into pu
Merge branch 'nox/eunit-macros-blocks' into pu
Merge branch 'ali/fix-inet-typespec' into pu
Merge branch 'mh/line-initial-commas' into pu
Merge branch 'jw/fix-float-middle-endian' into pu
Merge branch 'lpg/openssh_zlib' into pu