Second attempt at trying to fix the build.
Merge branch 'master' of https://github.com/mousom/netty

Conflicts:
	codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/QoS.java