NOJIRA: Maven POM file cleanup.
NOJIRA: More Maven POM cleanup.