Merge | Port #528 and #2091 to netfx#3376

benrr101 merged 2 commits intodotnet:maindotnet/SqlClient:mainfrom

edwardneal:port/pr-2091edwardneal/SqlClient:port/pr-2091Copy head branch name to clipboard