Merge remote-tracking branch 'azure/release' into dev

# Conflicts:
#	src/azure-cli-core/HISTORY.rst
#	src/azure-cli-core/azure/cli/core/__init__.py
#	src/azure-cli-core/setup.py
#	src/azure-cli/HISTORY.rst
#	src/azure-cli/azure/cli/__main__.py
#	src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_create.yaml
#	src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_delete.yaml
#	src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list.yaml
#	src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list_credentials.yaml
#	src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_show.yaml
#	src/azure-cli/requirements.py3.Darwin.txt
#	src/azure-cli/requirements.py3.Linux.txt
#	src/azure-cli/requirements.py3.windows.txt
#	src/azure-cli/setup.py