Merge in 'release/3.1' changes

Author: dotnet-bot

.azure/pipelines/ci.yml

@@ -7,9 +7,9 @@ trigger:
   batch: true
   branches:
     include:
-    - master
+    - main
     - release/*
-    - internal/release/3.*
+    - internal/release/*
 
 # Run PR validation on all branches
 pr:

eng/docker/rhel.Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
 
 # Setup User to match Host User, and give superuser permissions
 ARG USER

eng/docker/ubuntu-alpine37.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-85814b7-20200327151156
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
 ARG USER
 ARG USER_ID
 ARG GROUP_ID