Merge the squash of PR checkedc#930 to Microsoft with the original source

commit.

Since both sides have the same net change from the merge base
56d96c1 (indeed, the trees are
identical), this merge is fully "convergent" and has the same tree.
Then git will know during any future merges that this commit
incorporates both sides, avoiding any mismerges that might occur if we
tried to merge the two sides after further changes were made to one or
both of them.  The plan is that future large 3C PRs to Microsoft will be
merged with a normal merge commit rather than squashed, so we won't need
to take this special step again.

Author: mattmccutchen-cci