Fix issue 720 -- minor build fixes, from the issue:
* Add macros to append no_aop to the Bundle-(Symbolic)Name to help disambiguate
these bundles in OSGi
* Fix some broken links in the Maven POM
(The API version was already incremented.)

Patch from Stuart McCulloch, thanks Stuart!
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=57798649
diff --git a/build.xml b/build.xml
index 81ed3ee..22e2568 100644
--- a/build.xml
+++ b/build.xml
@@ -264,6 +264,9 @@
         <include name="NOTICE"/>
       </zipfileset>]]></replacetoken>
     </replace>
+    <replace file="build/no_aop/common.xml" value='Bundle-Name" value="$${ant.project.name} (no_aop)'>
+      <replacetoken><![CDATA[Bundle-Name" value="${ant.project.name}]]></replacetoken>
+    </replace>
   </target>
 
   <target name="clean.all"