Merge pull request #1511 from clebertsuconic/master

https://issues.jboss.org/browse/HORNETQ-1307 - server should switch to NIO if forcing to AIO on the config
fixing dead code