Merge "Make transactGetSockaddr locale safe"