Update POM file to use Apache parent with minor tidying