[#1539] Fix bug in DefaultChannelGroup.close() which was blocking the close() call on ServerChannel
Merge remote-tracking branch upstream/$:{upbranch}