Merge branch 'of-421-mina2' of https://github.com/aberenguel/Openfire into aberenguel-of-421-mina2

Conflicts:
	build/lib/versions.txt
	src/java/org/jivesoftware/openfire/nio/ClientConnectionHandler.java
	src/java/org/jivesoftware/openfire/nio/NIOConnection.java
	src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
Merge branch 'aberenguel-of-421-mina2'
Merge branch 'master' of https://github.com/igniterealtime/Openfire