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/composite/NOTICE b/ipojo/composite/NOTICE
index e833af7..21f4bfa 100644
--- a/ipojo/composite/NOTICE
+++ b/ipojo/composite/NOTICE
@@ -24,4 +24,4 @@
 
 III. License Summary
 - Apache License 2.0
-- BSD Licence
+- BSD License