[MC-154617] Server hangs on stop due to rcon

Simply put when you attempt to stop a server using the /stop command the server fails to shut down if an rcon client is connected. The log file shows the following exception as a result:

[15:20:21] [Server thread/WARN]: Thread yg@1cb3537d (RUNNABLE) failed to exit after 2 second(s)
[15:20:21] [Server thread/WARN]: Stack:
[15:20:21] [Server thread/WARN]: java.net.SocketInputStream.socketRead0(Native Method)
[15:20:21] [Server thread/WARN]: java.net.SocketInputStream.socketRead(SocketInputStream.java:116)
[15:20:21] [Server thread/WARN]: java.net.SocketInputStream.read(SocketInputStream.java:171)
[15:20:21] [Server thread/WARN]: java.net.SocketInputStream.read(SocketInputStream.java:141)
[15:20:21] [Server thread/WARN]: java.io.BufferedInputStream.fill(BufferedInputStream.java:246)
[15:20:21] [Server thread/WARN]: java.io.BufferedInputStream.read1(BufferedInputStream.java:286)
[15:20:21] [Server thread/WARN]: java.io.BufferedInputStream.read(BufferedInputStream.java:345)
[15:20:21] [Server thread/WARN]: yg.run(SourceFile:46)
[15:20:21] [Server thread/WARN]: java.lang.Thread.run(Thread.java:748)

I found this out when the server successfully shut down the moment I shut my rcon client down.