Kathryn Alexander

/cherrypick enterprise-4.12

@gpei, will you PTAL or suggest another reviewer?

/cherrypick enterprise-4.7

/cherrypick enterprise-4.8

/cherrypick enterprise-4.9

/cherrypick enterprise-4.10

/cherrypick enterprise-4.11

/cherrypick enterprise-4.12

@Rupesh-git-eng, the note is different in version 4.10 and earlier. Please confirm that this entire change is valid in 4.7 - 4.10.

@bburt-rh, will you PTAL?