[maven-release-plugin] prepare release netty-4.0.4.Final
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch upstream/$:{upbranch}