Merge recent changes on master to dev branch to resolve merge conflicts#11604

Merged

ChenTanyi merged 1 commit intoAzure:dev-containerservice-Microsoft.ContainerService-2020-11-01from xhl873:conflicts

Nov 10, 2020

+15-1

Commits on Nov 10, 2020

resovle merge conlicts to master, adding recent master change to dev branch

Xiahe Liu
authored and
Xiahe Liu
committed