Merge with trunk at revision 13213. Signed-off-by: lpleahy git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/SocketDev@13347 6f19259b-4bc3-4df7-8a09-765794883524