Merge from trunk:

Two minor fixes.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_93@535568 13f79535-47bb-0310-9956-ffa450edef68

xmlgraphics-fop-pom-template.pom

@@ -22,7 +22,7 @@
 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.xmlgraphics</groupId>
-  <artifactId>xmlgraphics-fop</artifactId>
+  <artifactId>fop</artifactId>
   <packaging>jar</packaging>
   <name>Apache FOP</name>
   <version>@version@</version>
@@ -127,7 +127,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
+      <version>4.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>