Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/pom.xml b/ipojo/pom.xml
index 25c6578..015471d 100644
--- a/ipojo/pom.xml
+++ b/ipojo/pom.xml
@@ -45,7 +45,7 @@
     <module>handler/whiteboard</module>
     <module>api</module>
     <module>online-manipulator</module>
-     <module>junit4osgi</module>
+    <module>junit4osgi</module>
   </modules>
 
 
@@ -59,7 +59,7 @@
       <module>annotations</module>
       <module>handler/jmx</module>
       <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
+      <!--<module>handler/transaction</module>-->
     </modules>
   </profile>
   <profile>
@@ -71,7 +71,7 @@
       <module>annotations</module>
       <module>handler/jmx</module>
       <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
+      <!--<module>handler/transaction</module>-->
     </modules>
   </profile>
   <profile>