merged back the RC branch

Conflicts:
	changelog.html
	cli/pom.xml
	core/pom.xml
	maven-plugin/pom.xml
	plugins/pom.xml
	pom.xml
	remoting/pom.xml
	test/pom.xml
	ui-samples-plugin/pom.xml
	war/pom.xml

changelog.html

@@ -105,8 +105,10 @@ Upcoming changes</a>
   <li class='major bug'>
     Fixed a regression that resulted in too much escaping
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9426">issue 9426</a>)
+  <li class='bug'>
+    Fixed a persistence problem in <tt>View$PropertyList</tt>
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9367">issue 9367</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.407>What's new in 1.407</a> (2011/04/15)</h3>
 <ul class=image>
   <li class='major bug'>

debian/debian/changelog

+jenkins (1.408) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 18 Apr 2011 21:59:40 -0700
+
 jenkins (1.407) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

test/pom.xml

@@ -55,7 +55,7 @@ THE SOFTWARE.
         <!-- see http://maven-junit-plugin.kenai.com/ for more info -->
         <groupId>com.sun.maven</groupId>
         <artifactId>maven-junit-plugin</artifactId>
-        <version>1.7</version>
+        <version>1.8</version>
         <executions>
           <execution>
             <goals>