Update Maven configuration
Prepare release svnmerge-2.0.4
Prepare for next development iteration