Pull Requests with Merge Conflicts

• ChingTsai (1)
  • ansible/ansible #46028 Add AWS IAM and AWS EC2 auth method to hashi_vault lookup
• cperrin88 (1)
  • ansible/ansible #42400 Added license_type, vm_identety and win_rm attributes to azure_rm_virtualmachine module
• JefStat (1)
  • ansible/ansible #20189 Addition parameter for elasticsearch_plugin module
• kbreit (1)
  • ansible/ansible #48394 meraki - Rewrite idempotency check
• nekonyuu (1)
  • ansible/ansible #27376 add support for sesu become method
• oussemos (1)
  • ansible/ansible #48672 Add support for modifying connection zones in nmcli module
• samdoran (1)
  • ansible/ansible #48628 [WIP] Move _handle_no_log_values() out of basic.py
• slapula (1)
  • ansible/ansible #40093 Adding module for managing secrets in AWS Secrets Manager
• smeso (1)
  • ansible/ansible #39794 debconf: add 'reconfigure' option
• spmp (1)
  • ansible/ansible #44875 azure_rm_virtualmachine: parallelise tests
• ssahani (1)
  • ansible/ansible #48870 nmcli: fix NetworkManager-glib package obsoleted
• t794104 (1)
  • ansible/ansible #49789 icinga2_host: A lot of fixes after extensive use in production
• webknjaz (1)
  • ansible/ansible #40441 Refactor systemd module