Merge "SocketChannelTest#testSocket_NonBlock_BasicStatusAfterConnect fix"