Apply fixes for MAVEN-584 and MAVEN-574.

Thanks Rafal!!


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113668 13f79535-47bb-0310-9956-ffa450edef68

multiproject/src/plugin-resources/templates/navigation-aggregate.xml

@@ -7,7 +7,7 @@
   <body>
     <menu name="Projects">
     #foreach ($reactorProject in $reactorProjects)
-      <item name="$reactorProject.name" href="/multiproject/${reactorProject.name}/index.html"/>
+      <item name="$reactorProject.name" href="/${aggregateDir}${reactorProject.artifactId}/index.html"/>
     #end
     </menu>