Merge pull request #23066 from SvenDowideit/docs-cherry-picks-29may2016

Docs cherry picks 29may2016